Messages in this thread Patch in this message | | | Date | Sun, 17 Jan 2010 16:10:04 +0100 | From | Roel Kluin <> | Subject | [PATCH] S2io: two branches the same in wait_for_cmd_complete() |
| |
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())
| |