3 files changed, 19 insertions, 28 deletions

diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index 004803030f64..a940d127aae3 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -666,7 +666,7 @@ int ide_driveid_update(ide_drive_t *drive)
         ide_hwif_t *hwif = drive->hwif;
         const struct ide_tp_ops *tp_ops = hwif->tp_ops;
         u16 *id;
-        unsigned long timeout, flags;
+        unsigned long flags;
         u8 stat;
 
         /*
@@ -678,16 +678,11 @@ int ide_driveid_update(ide_drive_t *drive)
         tp_ops->set_irq(hwif, 0);
         msleep(50);
         tp_ops->exec_command(hwif, ATA_CMD_ID_ATA);
-        timeout = jiffies + WAIT_WORSTCASE;
-        do {
-                if (time_after(jiffies, timeout)) {
-                        SELECT_MASK(drive, 0);
-                        return 0;       /* drive timed-out */
-                }
 
-                msleep(50);     /* give drive a breather */
-                stat = tp_ops->read_altstatus(hwif);
-        } while (stat & ATA_BUSY);
+        if (ide_busy_sleep(hwif, WAIT_WORSTCASE, 1)) {
+                SELECT_MASK(drive, 0);
+                return 0;
+        }
 
         msleep(50);     /* wait for IRQ and ATA_DRQ */
         stat = tp_ops->read_status(hwif);
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index e78cfde5bd6d..ef773384aaa9 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -291,17 +291,9 @@ static int actual_try_to_identify (ide_drive_t *drive, u8 cmd)
         tp_ops->exec_command(hwif, cmd);
 
         timeout = ((cmd == ATA_CMD_ID_ATA) ? WAIT_WORSTCASE : WAIT_PIDENTIFY) / 2;
-        timeout += jiffies;
-        do {
-                if (time_after(jiffies, timeout)) {
-                        /* drive timed-out */
-                        return 1;
-                }
-                /* give drive a breather */
-                msleep(50);
-                s = use_altstatus ? tp_ops->read_altstatus(hwif)
-                                  : tp_ops->read_status(hwif);
-        } while (s & ATA_BUSY);
+
+        if (ide_busy_sleep(hwif, timeout, use_altstatus))
+                return 1;
 
         /* wait for IRQ and ATA_DRQ */
         msleep(50);
@@ -383,19 +375,21 @@ static int try_to_identify (ide_drive_t *drive, u8 cmd)
         return retval;
 }
 
-static int ide_busy_sleep(ide_hwif_t *hwif)
+int ide_busy_sleep(ide_hwif_t *hwif, unsigned long timeout, int altstatus)
 {
-        unsigned long timeout = jiffies + WAIT_WORSTCASE;
         u8 stat;
 
+        timeout += jiffies;
+
         do {
-                msleep(50);
-                stat = hwif->tp_ops->read_status(hwif);
+                msleep(50);     /* give drive a breather */
+                stat = altstatus ? hwif->tp_ops->read_altstatus(hwif)
+                                 : hwif->tp_ops->read_status(hwif);
                 if ((stat & ATA_BUSY) == 0)
                         return 0;
         } while (time_before(jiffies, timeout));
 
-        return 1;
+        return 1;       /* drive timed-out */
 }
 
 static u8 ide_read_device(ide_drive_t *drive)
@@ -489,7 +483,7 @@ static int do_probe (ide_drive_t *drive, u8 cmd)
                         SELECT_DRIVE(drive);
                         msleep(50);
                         tp_ops->exec_command(hwif, ATA_CMD_DEV_RESET);
-                        (void)ide_busy_sleep(hwif);
+                        (void)ide_busy_sleep(hwif, WAIT_WORSTCASE, 0);
                         rc = try_to_identify(drive, cmd);
                 }
 
@@ -529,7 +523,7 @@ static void enable_nest (ide_drive_t *drive)
         msleep(50);
         tp_ops->exec_command(hwif, ATA_EXABYTE_ENABLE_NEST);
 
-        if (ide_busy_sleep(hwif)) {
+        if (ide_busy_sleep(hwif, WAIT_WORSTCASE, 0)) {
                 printk(KERN_CONT "failed (timeout)\n");
                 return;
         }
diff --git a/include/linux/ide.h b/include/linux/ide.h
index ca0b132de1ae..2ad8548135d2 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -923,6 +923,8 @@ void ide_fix_driveid(u16 *);
 
 extern void ide_fixstring(u8 *, const int, const int);
 
+int ide_busy_sleep(ide_hwif_t *, unsigned long, int);
+
 int ide_wait_stat(ide_startstop_t *, ide_drive_t *, u8, u8, unsigned long);
 
 extern ide_startstop_t ide_do_reset (ide_drive_t *);