Skip to content

Commit

Permalink
drivers/net/wireless/libertas: Adjust confusing if indentation
Browse files Browse the repository at this point in the history
At the point of the patched code, err has already been tested, so it is
only worthwhile to test it again in the if branches where it is changed.

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>
Acked-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Julia Lawall authored and John W. Linville committed Aug 16, 2010
1 parent 0460079 commit 2674f82
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/net/wireless/libertas/if_spi.c
Original file line number Diff line number Diff line change
Expand Up @@ -800,14 +800,16 @@ static int lbs_spi_thread(void *data)
goto err;
}

if (hiStatus & IF_SPI_HIST_CMD_UPLOAD_RDY)
if (hiStatus & IF_SPI_HIST_CMD_UPLOAD_RDY) {
err = if_spi_c2h_cmd(card);
if (err)
goto err;
if (hiStatus & IF_SPI_HIST_RX_UPLOAD_RDY)
}
if (hiStatus & IF_SPI_HIST_RX_UPLOAD_RDY) {
err = if_spi_c2h_data(card);
if (err)
goto err;
}

/* workaround: in PS mode, the card does not set the Command
* Download Ready bit, but it sets TX Download Ready. */
Expand Down

0 comments on commit 2674f82

Please sign in to comment.