From: Roel Kluin <roel.kluin@gmail.com>
To: netdev@vger.kernel.org, Andrew Morton <akpm@linux-foundation.org>,
LKML <linux-kernel@vger.kernel.org>,
"David S. Miller" <davem@davemloft.net>
Subject: [PATCH] S2io: two branches the same in wait_for_cmd_complete()
Date: Sun, 17 Jan 2010 16:10:04 +0100 [thread overview]
Message-ID: <4B53284C.1090405@gmail.com> (raw)
Regardless of the bit_state, the branches execute the same code.
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
---
drivers/net/s2io.c | 13 +++----------
1 files changed, 3 insertions(+), 10 deletions(-)
Maybe something else was intended?
this was introduced in commit 9fc93a41a1ad11
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index cc42186..0e353d6 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -3415,16 +3415,9 @@ static int wait_for_cmd_complete(void __iomem *addr, u64 busy_bit,
do {
val64 = readq(addr);
- if (bit_state == S2IO_BIT_RESET) {
- if (!(val64 & busy_bit)) {
- ret = SUCCESS;
- break;
- }
- } else {
- if (!(val64 & busy_bit)) {
- ret = SUCCESS;
- break;
- }
+ if (!(val64 & busy_bit)) {
+ ret = SUCCESS;
+ break;
}
if (in_interrupt())
next reply other threads:[~2010-01-17 15:05 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-17 15:10 Roel Kluin [this message]
2010-01-18 3:13 ` [PATCH] S2io: two branches the same in wait_for_cmd_complete() David Miller
2010-01-18 3:58 ` Joe Perches
2010-01-18 7:20 ` Ramkrishna Vepa
2010-01-19 9:59 ` David Miller
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=4B53284C.1090405@gmail.com \
--to=roel.kluin@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.