Commit 4a4fd471 authored Sep 29, 2010 by Julia Lawall Committed by Grant Likely Sep 29, 2010

spi/amba-pl022: Fix error case return statement.

The return -EINVAL appears to only make sense if the if branch that it is
aligned with is taken, and the indentation indicates that this is the
authors intent, 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>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

parent e447d358

drivers/spi/amba-pl022.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1350,10 +1350,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,

Admin message