* [PATCH 10/42] drivers/mmc/host: Adjust confusing if indentation
@ 2010-08-05 20:19 ` Julia Lawall
0 siblings, 0 replies; 10+ messages in thread
From: Julia Lawall @ 2010-08-05 20:19 UTC (permalink / raw)
To: linux-arm-kernel
From: Julia Lawall <julia@diku.dk>
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 at p1 S2 at 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>
---
drivers/mmc/host/imxmmc.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/mmc/host/imxmmc.c b/drivers/mmc/host/imxmmc.c
index 9a68ff4..5a950b1 100644
--- a/drivers/mmc/host/imxmmc.c
+++ b/drivers/mmc/host/imxmmc.c
@@ -148,11 +148,12 @@ static int imxmci_start_clock(struct imxmci_host *host)
while (delay--) {
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 */
reg = readw(host->base + MMC_REG_STATUS);
if (reg & STATUS_CARD_BUS_CLK_RUN)
return 0;
+ }
if (test_bit(IMXMCI_PEND_STARTED_b, &host->pending_events))
return 0;
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 10/42] drivers/mmc/host: Adjust confusing if indentation
@ 2010-08-05 20:19 ` Julia Lawall
0 siblings, 0 replies; 10+ messages in thread
From: Julia Lawall @ 2010-08-05 20:19 UTC (permalink / raw)
To: Pavel Pisa, linux-arm-kernel, linux-mmc, linux-kernel,
kernel-janitors
From: Julia Lawall <julia@diku.dk>
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>
---
drivers/mmc/host/imxmmc.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/mmc/host/imxmmc.c b/drivers/mmc/host/imxmmc.c
index 9a68ff4..5a950b1 100644
--- a/drivers/mmc/host/imxmmc.c
+++ b/drivers/mmc/host/imxmmc.c
@@ -148,11 +148,12 @@ static int imxmci_start_clock(struct imxmci_host *host)
while (delay--) {
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 */
reg = readw(host->base + MMC_REG_STATUS);
if (reg & STATUS_CARD_BUS_CLK_RUN)
return 0;
+ }
if (test_bit(IMXMCI_PEND_STARTED_b, &host->pending_events))
return 0;
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH 10/42] drivers/mmc/host: Adjust confusing if indentation
2010-08-05 20:19 ` Julia Lawall
(?)
(?)
@ 2010-08-05 20:57 ` Pavel Pisa
-1 siblings, 0 replies; 10+ messages in thread
From: Pavel Pisa @ 2010-08-05 20:57 UTC (permalink / raw)
To: linux-arm-kernel
On Thursday 05 August 2010 22:19:52 Julia Lawall wrote:
> From: Julia Lawall <julia@diku.dk>
...
> Signed-off-by: Julia Lawall <julia@diku.dk>
Acked-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>
Good catch.
> ---
> drivers/mmc/host/imxmmc.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/mmc/host/imxmmc.c b/drivers/mmc/host/imxmmc.c
> index 9a68ff4..5a950b1 100644
> --- a/drivers/mmc/host/imxmmc.c
> +++ b/drivers/mmc/host/imxmmc.c
> @@ -148,11 +148,12 @@ static int imxmci_start_clock(struct imxmci_host
> *host)
>
> while (delay--) {
> 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 */
> reg = readw(host->base + MMC_REG_STATUS);
> if (reg & STATUS_CARD_BUS_CLK_RUN)
> return 0;
> + }
>
> if (test_bit(IMXMCI_PEND_STARTED_b, &host->pending_events))
> return 0;
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
--
Pavel Pisa
e-mail: pisa@cmp.felk.cvut.cz
www: http://cmp.felk.cvut.cz/~pisa
university: http://dce.fel.cvut.cz/
company: http://www.pikron.com/
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH 10/42] drivers/mmc/host: Adjust confusing if indentation
@ 2010-08-05 20:57 ` Pavel Pisa
0 siblings, 0 replies; 10+ messages in thread
From: Pavel Pisa @ 2010-08-05 20:57 UTC (permalink / raw)
To: linux-arm-kernel; +Cc: Julia Lawall, linux-mmc, linux-kernel, kernel-janitors
On Thursday 05 August 2010 22:19:52 Julia Lawall wrote:
> From: Julia Lawall <julia@diku.dk>
...
> Signed-off-by: Julia Lawall <julia@diku.dk>
Acked-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>
Good catch.
> ---
> drivers/mmc/host/imxmmc.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/mmc/host/imxmmc.c b/drivers/mmc/host/imxmmc.c
> index 9a68ff4..5a950b1 100644
> --- a/drivers/mmc/host/imxmmc.c
> +++ b/drivers/mmc/host/imxmmc.c
> @@ -148,11 +148,12 @@ static int imxmci_start_clock(struct imxmci_host
> *host)
>
> while (delay--) {
> 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 */
> reg = readw(host->base + MMC_REG_STATUS);
> if (reg & STATUS_CARD_BUS_CLK_RUN)
> return 0;
> + }
>
> if (test_bit(IMXMCI_PEND_STARTED_b, &host->pending_events))
> return 0;
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
--
Pavel Pisa
e-mail: pisa@cmp.felk.cvut.cz
www: http://cmp.felk.cvut.cz/~pisa
university: http://dce.fel.cvut.cz/
company: http://www.pikron.com/
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH 10/42] drivers/mmc/host: Adjust confusing if indentation
@ 2010-08-05 20:57 ` Pavel Pisa
0 siblings, 0 replies; 10+ messages in thread
From: Pavel Pisa @ 2010-08-05 20:57 UTC (permalink / raw)
To: linux-arm-kernel
On Thursday 05 August 2010 22:19:52 Julia Lawall wrote:
> From: Julia Lawall <julia@diku.dk>
...
> Signed-off-by: Julia Lawall <julia@diku.dk>
Acked-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>
Good catch.
> ---
> drivers/mmc/host/imxmmc.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/mmc/host/imxmmc.c b/drivers/mmc/host/imxmmc.c
> index 9a68ff4..5a950b1 100644
> --- a/drivers/mmc/host/imxmmc.c
> +++ b/drivers/mmc/host/imxmmc.c
> @@ -148,11 +148,12 @@ static int imxmci_start_clock(struct imxmci_host
> *host)
>
> while (delay--) {
> 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 */
> reg = readw(host->base + MMC_REG_STATUS);
> if (reg & STATUS_CARD_BUS_CLK_RUN)
> return 0;
> + }
>
> if (test_bit(IMXMCI_PEND_STARTED_b, &host->pending_events))
> return 0;
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
--
Pavel Pisa
e-mail: pisa at cmp.felk.cvut.cz
www: http://cmp.felk.cvut.cz/~pisa
university: http://dce.fel.cvut.cz/
company: http://www.pikron.com/
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH 10/42] drivers/mmc/host: Adjust confusing if indentation
@ 2010-08-05 20:57 ` Pavel Pisa
0 siblings, 0 replies; 10+ messages in thread
From: Pavel Pisa @ 2010-08-05 20:57 UTC (permalink / raw)
To: linux-arm-kernel; +Cc: linux-mmc, kernel-janitors, Julia Lawall, linux-kernel
On Thursday 05 August 2010 22:19:52 Julia Lawall wrote:
> From: Julia Lawall <julia@diku.dk>
...
> Signed-off-by: Julia Lawall <julia@diku.dk>
Acked-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>
Good catch.
> ---
> drivers/mmc/host/imxmmc.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/mmc/host/imxmmc.c b/drivers/mmc/host/imxmmc.c
> index 9a68ff4..5a950b1 100644
> --- a/drivers/mmc/host/imxmmc.c
> +++ b/drivers/mmc/host/imxmmc.c
> @@ -148,11 +148,12 @@ static int imxmci_start_clock(struct imxmci_host
> *host)
>
> while (delay--) {
> 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 */
> reg = readw(host->base + MMC_REG_STATUS);
> if (reg & STATUS_CARD_BUS_CLK_RUN)
> return 0;
> + }
>
> if (test_bit(IMXMCI_PEND_STARTED_b, &host->pending_events))
> return 0;
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
--
Pavel Pisa
e-mail: pisa@cmp.felk.cvut.cz
www: http://cmp.felk.cvut.cz/~pisa
university: http://dce.fel.cvut.cz/
company: http://www.pikron.com/
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH RESEND] drivers/mmc/host: Adjust confusing if indentation
2010-08-05 20:19 ` Julia Lawall
(?)
@ 2010-08-27 21:08 ` Chris Ball
-1 siblings, 0 replies; 10+ messages in thread
From: Chris Ball @ 2010-08-27 21:08 UTC (permalink / raw)
To: linux-arm-kernel
Hi Andrew, doesn't look like anyone else has taken this yet.
From: Julia Lawall <julia@diku.dk>
Date: Thu, 5 Aug 2010 22:19:52 +0200 (CEST)
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>
---
drivers/mmc/host/imxmmc.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/mmc/host/imxmmc.c b/drivers/mmc/host/imxmmc.c
index 9a68ff4..5a950b1 100644
--- a/drivers/mmc/host/imxmmc.c
+++ b/drivers/mmc/host/imxmmc.c
@@ -148,11 +148,12 @@ static int imxmci_start_clock(struct imxmci_host *host)
while (delay--) {
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 */
reg = readw(host->base + MMC_REG_STATUS);
if (reg & STATUS_CARD_BUS_CLK_RUN)
return 0;
+ }
if (test_bit(IMXMCI_PEND_STARTED_b, &host->pending_events))
return 0;
--
Chris Ball <cjb@laptop.org> <http://printf.net/>
One Laptop Per Child
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH RESEND] drivers/mmc/host: Adjust confusing if indentation
@ 2010-08-27 21:08 ` Chris Ball
0 siblings, 0 replies; 10+ messages in thread
From: Chris Ball @ 2010-08-27 21:08 UTC (permalink / raw)
To: linux-arm-kernel
Hi Andrew, doesn't look like anyone else has taken this yet.
From: Julia Lawall <julia@diku.dk>
Date: Thu, 5 Aug 2010 22:19:52 +0200 (CEST)
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 at p1 S2 at 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>
---
drivers/mmc/host/imxmmc.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/mmc/host/imxmmc.c b/drivers/mmc/host/imxmmc.c
index 9a68ff4..5a950b1 100644
--- a/drivers/mmc/host/imxmmc.c
+++ b/drivers/mmc/host/imxmmc.c
@@ -148,11 +148,12 @@ static int imxmci_start_clock(struct imxmci_host *host)
while (delay--) {
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 */
reg = readw(host->base + MMC_REG_STATUS);
if (reg & STATUS_CARD_BUS_CLK_RUN)
return 0;
+ }
if (test_bit(IMXMCI_PEND_STARTED_b, &host->pending_events))
return 0;
--
Chris Ball <cjb@laptop.org> <http://printf.net/>
One Laptop Per Child
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH RESEND] drivers/mmc/host: Adjust confusing if indentation
@ 2010-08-27 21:08 ` Chris Ball
0 siblings, 0 replies; 10+ messages in thread
From: Chris Ball @ 2010-08-27 21:08 UTC (permalink / raw)
To: akpm
Cc: Julia Lawall, Pavel Pisa, linux-arm-kernel, linux-mmc,
linux-kernel, kernel-janitors
Hi Andrew, doesn't look like anyone else has taken this yet.
From: Julia Lawall <julia@diku.dk>
Date: Thu, 5 Aug 2010 22:19:52 +0200 (CEST)
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>
---
drivers/mmc/host/imxmmc.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/mmc/host/imxmmc.c b/drivers/mmc/host/imxmmc.c
index 9a68ff4..5a950b1 100644
--- a/drivers/mmc/host/imxmmc.c
+++ b/drivers/mmc/host/imxmmc.c
@@ -148,11 +148,12 @@ static int imxmci_start_clock(struct imxmci_host *host)
while (delay--) {
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 */
reg = readw(host->base + MMC_REG_STATUS);
if (reg & STATUS_CARD_BUS_CLK_RUN)
return 0;
+ }
if (test_bit(IMXMCI_PEND_STARTED_b, &host->pending_events))
return 0;
--
Chris Ball <cjb@laptop.org> <http://printf.net/>
One Laptop Per Child
^ permalink raw reply related [flat|nested] 10+ messages in thread