Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drivers/mmc/host/imxmmc.c: adjust confusing if indentation

Move the second if (reg & ...) test into the branch indicated by its
indentation. The test was previously always executed after the if
containing that branch, but it was always false unless the if branch was
taken.

The semantic match that finds this problem is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@r disable braces4@
position p1,p2;
statement S1,S2;
@@

(
if (...) { ... }
|
if (...) S1@p1 S2@p2
)

@script:python@
p1 << r.p1;
p2 << r.p2;
@@

if (p1[0].column == p2[0].column):
cocci.print_main("branch",p1)
cocci.print_secs("after",p2)
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Chris Ball <cjb@laptop.org>
Cc: Pavel Pisa <ppisa@pikron.com>
Cc: <linux-mmc@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Julia Lawall and committed by
Linus Torvalds
7c5367f2 e7cb756f

+2 -1
+2 -1
drivers/mmc/host/imxmmc.c
··· 148 148 149 149 while (delay--) { 150 150 reg = readw(host->base + MMC_REG_STATUS); 151 - if (reg & STATUS_CARD_BUS_CLK_RUN) 151 + if (reg & STATUS_CARD_BUS_CLK_RUN) { 152 152 /* Check twice before cut */ 153 153 reg = readw(host->base + MMC_REG_STATUS); 154 154 if (reg & STATUS_CARD_BUS_CLK_RUN) 155 155 return 0; 156 + } 156 157 157 158 if (test_bit(IMXMCI_PEND_STARTED_b, &host->pending_events)) 158 159 return 0;