diff options
author | Joe Perches <joe@perches.com> | 2010-03-10 18:20:47 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-12 18:52:29 -0500 |
commit | 045f98363080ddbbcef6b8b8306ec58a818406a0 (patch) | |
tree | 06e86794ce065fa33224bdfa609b59cefd9728f5 | |
parent | a81ee5447157a4b9930bab8ec70cf77a55db64e8 (diff) |
drivers/block/floppy.c: remove used once CHECK_READY macro
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>
-rw-r--r-- | drivers/block/floppy.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index 3072003d81ca..88a741c75110 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c | |||
@@ -575,7 +575,6 @@ static void floppy_release_irq_and_dma(void); | |||
575 | * reset doesn't need to be tested before sending commands, because | 575 | * reset doesn't need to be tested before sending commands, because |
576 | * output_byte is automatically disabled when reset is set. | 576 | * output_byte is automatically disabled when reset is set. |
577 | */ | 577 | */ |
578 | #define CHECK_RESET { if (FDCS->reset){ reset_fdc(); return; } } | ||
579 | static void reset_fdc(void); | 578 | static void reset_fdc(void); |
580 | 579 | ||
581 | /* | 580 | /* |
@@ -1958,7 +1957,10 @@ static int start_motor(void (*function)(void)) | |||
1958 | 1957 | ||
1959 | static void floppy_ready(void) | 1958 | static void floppy_ready(void) |
1960 | { | 1959 | { |
1961 | CHECK_RESET; | 1960 | if (FDCS->reset) { |
1961 | reset_fdc(); | ||
1962 | return; | ||
1963 | } | ||
1962 | if (start_motor(floppy_ready)) | 1964 | if (start_motor(floppy_ready)) |
1963 | return; | 1965 | return; |
1964 | if (fdc_dtr()) | 1966 | if (fdc_dtr()) |