From patchwork Sun Jul 19 15:30:26 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julia Lawall X-Patchwork-Id: 36246 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n6JFVJH4021603 for ; Sun, 19 Jul 2009 15:31:19 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754677AbZGSPaa (ORCPT ); Sun, 19 Jul 2009 11:30:30 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754689AbZGSPaa (ORCPT ); Sun, 19 Jul 2009 11:30:30 -0400 Received: from mgw1.diku.dk ([130.225.96.91]:57942 "EHLO mgw1.diku.dk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754677AbZGSPa2 (ORCPT ); Sun, 19 Jul 2009 11:30:28 -0400 Received: from localhost (localhost [127.0.0.1]) by mgw1.diku.dk (Postfix) with ESMTP id 2A4E452C3AB; Sun, 19 Jul 2009 17:30:28 +0200 (CEST) X-Virus-Scanned: amavisd-new at diku.dk Received: from mgw1.diku.dk ([127.0.0.1]) by localhost (mgw1.diku.dk [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id f67tTc3RplqM; Sun, 19 Jul 2009 17:30:26 +0200 (CEST) Received: from nhugin.diku.dk (nhugin.diku.dk [130.225.96.140]) by mgw1.diku.dk (Postfix) with ESMTP id 2A7BC52C325; Sun, 19 Jul 2009 17:30:26 +0200 (CEST) Received: from ask.diku.dk (ask.diku.dk [130.225.96.225]) by nhugin.diku.dk (Postfix) with ESMTP id B0D1F6DF88D; Sun, 19 Jul 2009 17:29:53 +0200 (CEST) Received: by ask.diku.dk (Postfix, from userid 3767) id 162A7154B7F; Sun, 19 Jul 2009 17:30:26 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by ask.diku.dk (Postfix) with ESMTP id 142541547DF; Sun, 19 Jul 2009 17:30:26 +0200 (CEST) Date: Sun, 19 Jul 2009 17:30:26 +0200 (CEST) From: Julia Lawall To: jarkko.lavinen@nokia.com, linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH 9/10] drivers/mmc: Move a dereference below a NULL test Message-ID: MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org From: Julia Lawall If the NULL test is necessary, then the dereference should be moved below the NULL test. The semantic patch that makes this change is as follows: (http://www.emn.fr/x-info/coccinelle/) // @@ type T; expression E,E1; identifier i,fld; statement S; @@ - T i = E->fld; + T i; ... when != E=E1 when != i BUG_ON (E == NULL|| - i + E->fld == NULL || ...); + i = E->fld; // Signed-off-by: Julia Lawall --- drivers/mmc/host/omap.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c index e7a331d..89281ab 100644 --- a/drivers/mmc/host/omap.c +++ b/drivers/mmc/host/omap.c @@ -255,11 +255,12 @@ static void mmc_omap_slot_release_work(struct work_struct *work) static void mmc_omap_release_slot(struct mmc_omap_slot *slot, int clk_enabled) { - struct mmc_omap_host *host = slot->host; + struct mmc_omap_host *host; unsigned long flags; int i; - BUG_ON(slot == NULL || host->mmc == NULL); + BUG_ON(slot == NULL || slot->host->mmc == NULL); + host = slot->host; if (clk_enabled) /* Keeps clock running for at least 8 cycles on valid freq */