* [PATCH 26/42] drivers/spi: Adjust confusing if indentation
@ 2010-08-05 20:24 Julia Lawall
2010-08-05 20:30 ` David Brownell
0 siblings, 1 reply; 4+ messages in thread
From: Julia Lawall @ 2010-08-05 20:24 UTC (permalink / raw)
To: David Brownell, Grant Likely, spi-devel-general, linux-kernel,
kernel-janitors
From: Julia Lawall <julia@diku.dk>
The return -EINVAL appears to only make sense if the if branch that it is
aligned with is taken, so move it into that branch
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>
---
This patch changes the semantics, and the change might not be correct.
drivers/spi/amba-pl022.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/spi/amba-pl022.c b/drivers/spi/amba-pl022.c
index f0a1418..4de50de 100644
--- a/drivers/spi/amba-pl022.c
+++ b/drivers/spi/amba-pl022.c
@@ -1348,10 +1348,11 @@ static int verify_controller_parameters(struct pl022 *pl022,
if ((chip_info->duplex !=
SSP_MICROWIRE_CHANNEL_FULL_DUPLEX)
&& (chip_info->duplex !=
- SSP_MICROWIRE_CHANNEL_HALF_DUPLEX))
+ SSP_MICROWIRE_CHANNEL_HALF_DUPLEX)) {
dev_err(chip_info->dev,
"Microwire duplex mode is configured incorrectly\n");
return -EINVAL;
+ }
} else {
if (chip_info->duplex != SSP_MICROWIRE_CHANNEL_FULL_DUPLEX)
dev_err(chip_info->dev,
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH 26/42] drivers/spi: Adjust confusing if indentation
2010-08-05 20:24 [PATCH 26/42] drivers/spi: Adjust confusing if indentation Julia Lawall
@ 2010-08-05 20:30 ` David Brownell
2010-08-05 20:36 ` [PATCH 26/42] drivers/spi/amba-pl022.c: " Julia Lawall
0 siblings, 1 reply; 4+ messages in thread
From: David Brownell @ 2010-08-05 20:30 UTC (permalink / raw)
To: Grant Likely, spi-devel-general, linux-kernel, kernel-janitors,
Julia Lawall
It's not all of drivrers/spi -- just one
specific driver. Please update $SUBJECT and
patch description to be more accurate.
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 26/42] drivers/spi/amba-pl022.c: Adjust confusing if indentation
2010-08-05 20:30 ` David Brownell
@ 2010-08-05 20:36 ` Julia Lawall
2010-08-05 21:41 ` [spi-devel-general] " Linus Walleij
0 siblings, 1 reply; 4+ messages in thread
From: Julia Lawall @ 2010-08-05 20:36 UTC (permalink / raw)
To: David Brownell
Cc: Grant Likely, spi-devel-general, linux-kernel, kernel-janitors
From: Julia Lawall <julia@diku.dk>
The return -EINVAL appears to only make sense if the if branch that it is
aligned with is taken, so move it into that branch
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>
---
This patch changes the semantics, and the change might not be correct.
drivers/spi/amba-pl022.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/spi/amba-pl022.c b/drivers/spi/amba-pl022.c
index f0a1418..4de50de 100644
--- a/drivers/spi/amba-pl022.c
+++ b/drivers/spi/amba-pl022.c
@@ -1348,10 +1348,11 @@ static int verify_controller_parameters(struct pl022 *pl022,
if ((chip_info->duplex !=
SSP_MICROWIRE_CHANNEL_FULL_DUPLEX)
&& (chip_info->duplex !=
- SSP_MICROWIRE_CHANNEL_HALF_DUPLEX))
+ SSP_MICROWIRE_CHANNEL_HALF_DUPLEX)) {
dev_err(chip_info->dev,
"Microwire duplex mode is configured incorrectly\n");
return -EINVAL;
+ }
} else {
if (chip_info->duplex != SSP_MICROWIRE_CHANNEL_FULL_DUPLEX)
dev_err(chip_info->dev,
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [spi-devel-general] [PATCH 26/42] drivers/spi/amba-pl022.c: Adjust confusing if indentation
2010-08-05 20:36 ` [PATCH 26/42] drivers/spi/amba-pl022.c: " Julia Lawall
@ 2010-08-05 21:41 ` Linus Walleij
0 siblings, 0 replies; 4+ messages in thread
From: Linus Walleij @ 2010-08-05 21:41 UTC (permalink / raw)
To: Julia Lawall
Cc: David Brownell, spi-devel-general, kernel-janitors, linux-kernel
2010/8/5 Julia Lawall <julia@diku.dk>:
> From: Julia Lawall <julia@diku.dk>
>
> The return -EINVAL appears to only make sense if the if branch that it is
> aligned with is taken, so move it into that branch
What a nasty bug to see, thanks for robot-finding this!
Acked-by: Linus Walleij <linus.walleij@stericsson.com>
Yours,
Linus Walleij
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-08-05 21:41 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-08-05 20:24 [PATCH 26/42] drivers/spi: Adjust confusing if indentation Julia Lawall
2010-08-05 20:30 ` David Brownell
2010-08-05 20:36 ` [PATCH 26/42] drivers/spi/amba-pl022.c: " Julia Lawall
2010-08-05 21:41 ` [spi-devel-general] " Linus Walleij
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®