Commit 7c5367f2 authored by Julia Lawall's avatar Julia Lawall Committed by Linus Torvalds

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: default avatarJulia Lawall <julia@diku.dk>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
Cc: Pavel Pisa <ppisa@pikron.com>
Cc: <linux-mmc@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e7cb756f
...@@ -148,11 +148,12 @@ static int imxmci_start_clock(struct imxmci_host *host) ...@@ -148,11 +148,12 @@ static int imxmci_start_clock(struct imxmci_host *host)
while (delay--) { while (delay--) {
reg = readw(host->base + MMC_REG_STATUS); reg = readw(host->base + MMC_REG_STATUS);
if (reg & STATUS_CARD_BUS_CLK_RUN) if (reg & STATUS_CARD_BUS_CLK_RUN) {
/* Check twice before cut */ /* Check twice before cut */
reg = readw(host->base + MMC_REG_STATUS); reg = readw(host->base + MMC_REG_STATUS);
if (reg & STATUS_CARD_BUS_CLK_RUN) if (reg & STATUS_CARD_BUS_CLK_RUN)
return 0; return 0;
}
if (test_bit(IMXMCI_PEND_STARTED_b, &host->pending_events)) if (test_bit(IMXMCI_PEND_STARTED_b, &host->pending_events))
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment