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>
This commit is contained in:
parent
74f63f469e
commit
c529730a98
|
@ -639,8 +639,8 @@ static const char *timeout_message;
|
||||||
static void is_alive(const char *message)
|
static void is_alive(const char *message)
|
||||||
{
|
{
|
||||||
/* this routine checks whether the floppy driver is "alive" */
|
/* this routine checks whether the floppy driver is "alive" */
|
||||||
if (test_bit(0, &fdc_busy) && command_status < 2
|
if (test_bit(0, &fdc_busy) && command_status < 2 &&
|
||||||
&& !timer_pending(&fd_timeout)) {
|
!timer_pending(&fd_timeout)) {
|
||||||
DPRINT("timeout handler died: %s\n", message);
|
DPRINT("timeout handler died: %s\n", message);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1769,8 +1769,8 @@ irqreturn_t floppy_interrupt(int irq, void *dev_id)
|
||||||
if (do_print)
|
if (do_print)
|
||||||
print_result("sensei", inr);
|
print_result("sensei", inr);
|
||||||
max_sensei--;
|
max_sensei--;
|
||||||
} while ((ST0 & 0x83) != UNIT(current_drive) && inr == 2
|
} while ((ST0 & 0x83) != UNIT(current_drive) &&
|
||||||
&& max_sensei);
|
inr == 2 && max_sensei);
|
||||||
}
|
}
|
||||||
if (!handler) {
|
if (!handler) {
|
||||||
FDCS->reset = 1;
|
FDCS->reset = 1;
|
||||||
|
|
Loading…
Reference in New Issue