From: Dan Williams <dcbw@redhat.com>
To: Julia Lawall <julia@diku.dk>
Cc: "John W. Linville" <linville@tuxdriver.com>,
libertas-dev@lists.infradead.org, linux-wireless@vger.kernel.org,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
kernel-janitors@vger.kernel.org
Subject: Re: [PATCH 23/42] drivers/net/wireless/libertas: Adjust confusing if indentation
Date: Thu, 05 Aug 2010 16:50:44 -0500 [thread overview]
Message-ID: <1281045044.18688.5.camel@dcbw.foobar.com> (raw)
In-Reply-To: <Pine.LNX.4.64.1008052223340.31692@ask.diku.dk>
On Thu, 2010-08-05 at 22:23 +0200, Julia Lawall wrote:
> From: Julia Lawall <julia@diku.dk>
>
> 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>
> ---
> drivers/net/wireless/libertas/if_spi.c | 6 ++++--
> 1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/wireless/libertas/if_spi.c b/drivers/net/wireless/libertas/if_spi.c
> index fe3f080..3965c6c 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. */
prev parent reply other threads:[~2010-08-05 21:49 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-05 20:23 [PATCH 23/42] drivers/net/wireless/libertas: Adjust confusing if indentation Julia Lawall
2010-08-05 21:50 ` Dan Williams [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1281045044.18688.5.camel@dcbw.foobar.com \
--to=dcbw@redhat.com \
--cc=julia@diku.dk \
--cc=kernel-janitors@vger.kernel.org \
--cc=libertas-dev@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).