From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754802AbZGSPab (ORCPT ); Sun, 19 Jul 2009 11:30:31 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754709AbZGSPaa (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 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 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@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(-) 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 */