diff options
| author | Julia Lawall <julia@diku.dk> | 2010-08-05 22:23:54 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-08-16 15:26:41 -0400 |
| commit | 2674f82d3eef97df98fd5dbd4224ce1ce4800a3b (patch) | |
| tree | d79d639bd6fc730523e5ed9aa725e0aadc0235d4 | |
| parent | 04600794958f1833f5571c6cde40f260ab557f55 (diff) | |
| download | talos-obmc-linux-2674f82d3eef97df98fd5dbd4224ce1ce4800a3b.tar.gz talos-obmc-linux-2674f82d3eef97df98fd5dbd4224ce1ce4800a3b.zip | |
drivers/net/wireless/libertas: Adjust confusing if indentation
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>
| -rw-r--r-- | drivers/net/wireless/libertas/if_spi.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wireless/libertas/if_spi.c b/drivers/net/wireless/libertas/if_spi.c index fe3f08028eb3..3965c6cf504a 100644 --- a/drivers/net/wireless/libertas/if_spi.c +++ b/drivers/net/wireless/libertas/if_spi.c @@ -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. */ |
