diff options
| author | Joe Perches | 2010-03-11 00:20:58 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2010-03-13 00:52:30 +0100 |
| commit | c529730a98874fa951995d8a312c7fd606832eda (patch) | |
| tree | 1098a8037fb30b73e672d69b8f6a9cfe4e6387aa /drivers/block/floppy.c | |
| parent | drivers/block/floppy.c: convert int 1/0 to bool true/false (diff) | |
| download | kernel-qcow2-linux-c529730a98874fa951995d8a312c7fd606832eda.tar.gz kernel-qcow2-linux-c529730a98874fa951995d8a312c7fd606832eda.tar.xz kernel-qcow2-linux-c529730a98874fa951995d8a312c7fd606832eda.zip | |
drivers/block/floppy.c: move leading && and || to preceding line
Signed-off-by: Joe Perches <joe@perches.com>
Cc: Stephen Hemminger <shemminger@vyatta.com>
Cc: Jens Axboe <jens.axboe@oracle.com>
Cc: Marcin Slusarz <marcin.slusarz@gmail.com>
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/block/floppy.c')
| -rw-r--r-- | 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 028d7e4749d0..94c7abc5e291 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c @@ -639,8 +639,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); } } @@ -1769,8 +1769,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; |