[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <e271403c6870043f371d260062c10e9166cfe5d9.1264133863.git.joe@perches.com>
Date: Thu, 21 Jan 2010 20:52:35 -0800
From: Joe Perches <joe@...ches.com>
To: linux-kernel@...r.kernel.org
Cc: Marcin Slusarz <marcin.slusarz@...il.com>,
Stephen Hemminger <shemminger@...tta.com>,
Bartlomiej Zolnierkiewicz <bzolnier@...il.com>,
Andrew Morton <akpm@...ux-foundation.org>
Subject: [PATCH 05/24] drivers/block/floppy.c: Remove used once CHECK_READY macro
Signed-off-by: Joe Perches <joe@...ches.com>
---
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 ac5a4cb..f8c69fa 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())
--
1.6.6.rc0.57.gad7a
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists