ide: use wait_drive_not_busy() in drive_cmd_intr() (take 2)

Use wait_drive_not_busy() in drive_cmd_intr().

v2:
* Fix wait_drive_not_busy() comment (noticed by Sergei).

Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

2 files changed, 3 insertions, 6 deletions

diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index 0f3e2f4f9c2c..513a5685db2f 100644
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -640,7 +640,6 @@ static ide_startstop_t drive_cmd_intr (ide_drive_t *drive)
         ide_hwif_t *hwif = HWIF(drive);
         u8 *args = (u8 *) rq->buffer;
         u8 stat = hwif->INB(IDE_STATUS_REG);
-        int retries = 10;
 
         local_irq_enable_in_hardirq();
         if (rq->cmd_type == REQ_TYPE_ATA_CMD &&
@@ -649,8 +648,7 @@ static ide_startstop_t drive_cmd_intr (ide_drive_t *drive)
                 drive->io_32bit = 0;
                 hwif->ata_input_data(drive, &args[4], args[3] * SECTOR_WORDS);
                 drive->io_32bit = io_32bit;
-                while (((stat = hwif->INB(IDE_STATUS_REG)) & BUSY_STAT) && retries--)
-                        udelay(100);
+                stat = wait_drive_not_busy(drive);
         }
 
         if (!OK_STAT(stat, READY_STAT, BAD_STAT))
diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index c34836c02b14..b559bece6e73 100644
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -260,7 +260,7 @@ static ide_startstop_t task_no_data_intr(ide_drive_t *drive)
         return ide_stopped;
 }
 
-static u8 wait_drive_not_busy(ide_drive_t *drive)
+u8 wait_drive_not_busy(ide_drive_t *drive)
 {
         ide_hwif_t *hwif = HWIF(drive);
         int retries;
@@ -268,8 +268,7 @@ static u8 wait_drive_not_busy(ide_drive_t *drive)
 
         /*
          * Last sector was transfered, wait until drive is ready.
-         * This can take up to 10 usec, but we will wait max 1 ms
-         * (drive_cmd_intr() waits that long).
+         * This can take up to 10 usec, but we will wait max 1 ms.
          */
         for (retries = 0; retries < 100; retries++) {
                 if ((stat = hwif->INB(IDE_STATUS_REG)) & BUSY_STAT)