Messages in this thread Patch in this message | | | From | Joe Perches <> | Subject | [PATCH 08/13] drivers/block/floppy.c: Move leading && and || to preceding line | Date | Tue, 1 Dec 2009 22:07:48 -0800 |
| |
Signed-off-by: Joe Perches <joe@perches.com> --- drivers/block/floppy.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index 90352f6..96b1b21 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c @@ -1163,8 +1163,8 @@ static const char *timeout_message; static void is_alive(const char *message) { /* this routine checks whether the floppy driver is "alive" */ - if (test_bit(0, &fdc_busy) && command_status < 2 - && !timer_pending(&fd_timeout)) { + if (test_bit(0, &fdc_busy) && command_status < 2 && + !timer_pending(&fd_timeout)) { DPRINT("timeout handler died: %s\n", message); } } @@ -2296,8 +2296,8 @@ irqreturn_t floppy_interrupt(int irq, void *dev_id) if (do_print) print_result("sensei", inr); max_sensei--; - } while ((ST0 & 0x83) != UNIT(current_drive) && inr == 2 - && max_sensei); + } while ((ST0 & 0x83) != UNIT(current_drive) && + inr == 2 && max_sensei); } if (!handler) { FDCS->reset = 1; -- 1.6.6.rc0.57.gad7a
| |