From: Joe Perches Date: Wed, 10 Mar 2010 23:20:47 +0000 (-0800) Subject: drivers/block/floppy.c: remove used once CHECK_READY macro X-Git-Tag: v2.6.34-rc2~263 X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=045f98363080ddbbcef6b8b8306ec58a818406a0;p=~shefty%2Frdma-dev.git drivers/block/floppy.c: remove used once CHECK_READY macro Signed-off-by: Joe Perches Cc: Stephen Hemminger Cc: Jens Axboe Cc: Marcin Slusarz Cc: Bartlomiej Zolnierkiewicz Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index 3072003d81c..88a741c7511 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c @@ -575,7 +575,6 @@ static void floppy_release_irq_and_dma(void); * reset doesn't need to be tested before sending commands, because * output_byte is automatically disabled when reset is set. */ -#define CHECK_RESET { if (FDCS->reset){ reset_fdc(); return; } } static void reset_fdc(void); /* @@ -1958,7 +1957,10 @@ static int start_motor(void (*function)(void)) static void floppy_ready(void) { - CHECK_RESET; + if (FDCS->reset) { + reset_fdc(); + return; + } if (start_motor(floppy_ready)) return; if (fdc_dtr())