1 files changed, 80 insertions, 95 deletions

diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 0379d1f697cf..edf650b20c67 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -235,9 +235,6 @@ static inline void do_identify (ide_drive_t *drive, u8 cmd)
         drive->media = ide_disk;
         printk("%s DISK drive\n", (id->config == 0x848a) ? "CFA" : "ATA" );
 
-        if (hwif->quirkproc)
-                drive->quirk_list = hwif->quirkproc(drive);
-
         return;
 
 err_misc:
@@ -353,22 +350,19 @@ static int try_to_identify (ide_drive_t *drive, u8 cmd)
          * the irq handler isn't expecting.
          */
         if (IDE_CONTROL_REG) {
-                u8 ctl = drive->ctl | 2;
                 if (!hwif->irq) {
                         autoprobe = 1;
                         cookie = probe_irq_on();
-                        /* enable device irq */
-                        ctl &= ~2;
                 }
-                hwif->OUTB(ctl, IDE_CONTROL_REG);
+                ide_set_irq(drive, autoprobe);
         }
 
         retval = actual_try_to_identify(drive, cmd);
 
         if (autoprobe) {
                 int irq;
-                /* mask device irq */
-                hwif->OUTB(drive->ctl|2, IDE_CONTROL_REG);
+
+                ide_set_irq(drive, 0);
                 /* clear drive IRQ */
                 (void) hwif->INB(IDE_STATUS_REG);
                 udelay(5);
@@ -388,6 +382,20 @@ static int try_to_identify (ide_drive_t *drive, u8 cmd)
         return retval;
 }
 
+static int ide_busy_sleep(ide_hwif_t *hwif)
+{
+        unsigned long timeout = jiffies + WAIT_WORSTCASE;
+        u8 stat;
+
+        do {
+                msleep(50);
+                stat = hwif->INB(hwif->io_ports[IDE_STATUS_OFFSET]);
+                if ((stat & BUSY_STAT) == 0)
+                        return 0;
+        } while (time_before(jiffies, timeout));
+
+        return 1;
+}
 
 /**
  *      do_probe                -       probe an IDE device
@@ -456,7 +464,6 @@ static int do_probe (ide_drive_t *drive, u8 cmd)
                 if ((rc == 1 && cmd == WIN_PIDENTIFY) &&
                         ((drive->autotune == IDE_TUNE_DEFAULT) ||
                         (drive->autotune == IDE_TUNE_AUTO))) {
-                        unsigned long timeout;
                         printk("%s: no response (status = 0x%02x), "
                                 "resetting drive\n", drive->name,
                                 hwif->INB(IDE_STATUS_REG));
@@ -464,10 +471,7 @@ static int do_probe (ide_drive_t *drive, u8 cmd)
                         hwif->OUTB(drive->select.all, IDE_SELECT_REG);
                         msleep(50);
                         hwif->OUTB(WIN_SRST, IDE_COMMAND_REG);
-                        timeout = jiffies;
-                        while (((hwif->INB(IDE_STATUS_REG)) & BUSY_STAT) &&
-                               time_before(jiffies, timeout + WAIT_WORSTCASE))
-                                msleep(50);
+                        (void)ide_busy_sleep(hwif);
                         rc = try_to_identify(drive, cmd);
                 }
                 if (rc == 1)
@@ -495,20 +499,16 @@ static int do_probe (ide_drive_t *drive, u8 cmd)
 static void enable_nest (ide_drive_t *drive)
 {
         ide_hwif_t *hwif = HWIF(drive);
-        unsigned long timeout;
 
         printk("%s: enabling %s -- ", hwif->name, drive->id->model);
         SELECT_DRIVE(drive);
         msleep(50);
         hwif->OUTB(EXABYTE_ENABLE_NEST, IDE_COMMAND_REG);
-        timeout = jiffies + WAIT_WORSTCASE;
-        do {
-                if (time_after(jiffies, timeout)) {
-                        printk("failed (timeout)\n");
-                        return;
-                }
-                msleep(50);
-        } while ((hwif->INB(IDE_STATUS_REG)) & BUSY_STAT);
+
+        if (ide_busy_sleep(hwif)) {
+                printk(KERN_CONT "failed (timeout)\n");
+                return;
+        }
 
         msleep(50);
 
@@ -656,8 +656,7 @@ static int wait_hwif_ready(ide_hwif_t *hwif)
                 /* Ignore disks that we will not probe for later. */
                 if (!drive->noprobe || drive->present) {
                         SELECT_DRIVE(drive);
-                        if (IDE_CONTROL_REG)
-                                hwif->OUTB(drive->ctl, IDE_CONTROL_REG);
+                        ide_set_irq(drive, 1);
                         mdelay(2);
                         rc = ide_wait_not_busy(hwif, 35000);
                         if (rc)
@@ -676,19 +675,18 @@ out:
 
 /**
  *      ide_undecoded_slave     -       look for bad CF adapters
- *      @hwif: interface
+ *      @drive1: drive
  *
  *      Analyse the drives on the interface and attempt to decide if we
  *      have the same drive viewed twice. This occurs with crap CF adapters
  *      and PCMCIA sometimes.
  */
 
-void ide_undecoded_slave(ide_hwif_t *hwif)
+void ide_undecoded_slave(ide_drive_t *drive1)
 {
-        ide_drive_t *drive0 = &hwif->drives[0];
-        ide_drive_t *drive1 = &hwif->drives[1];
+        ide_drive_t *drive0 = &drive1->hwif->drives[0];
 
-        if (drive0->present == 0 || drive1->present == 0)
+        if ((drive1->dn & 1) == 0 || drive0->present == 0)
                 return;
 
         /* If the models don't match they are not the same product */
@@ -791,18 +789,11 @@ static void probe_hwif(ide_hwif_t *hwif)
                 }
         }
         if (hwif->io_ports[IDE_CONTROL_OFFSET] && hwif->reset) {
-                unsigned long timeout = jiffies + WAIT_WORSTCASE;
-                u8 stat;
-
                 printk(KERN_WARNING "%s: reset\n", hwif->name);
                 hwif->OUTB(12, hwif->io_ports[IDE_CONTROL_OFFSET]);
                 udelay(10);
                 hwif->OUTB(8, hwif->io_ports[IDE_CONTROL_OFFSET]);
-                do {
-                        msleep(50);
-                        stat = hwif->INB(hwif->io_ports[IDE_STATUS_OFFSET]);
-                } while ((stat & BUSY_STAT) && time_after(timeout, jiffies));
-
+                (void)ide_busy_sleep(hwif);
         }
         local_irq_restore(flags);
         /*
@@ -817,8 +808,12 @@ static void probe_hwif(ide_hwif_t *hwif)
                 return;
         }
 
-        if (hwif->fixup)
-                hwif->fixup(hwif);
+        for (unit = 0; unit < MAX_DRIVES; unit++) {
+                ide_drive_t *drive = &hwif->drives[unit];
+
+                if (drive->present && hwif->quirkproc)
+                        hwif->quirkproc(drive);
+        }
 
         for (unit = 0; unit < MAX_DRIVES; ++unit) {
                 ide_drive_t *drive = &hwif->drives[unit];
@@ -833,7 +828,7 @@ static void probe_hwif(ide_hwif_t *hwif)
 
                         drive->nice1 = 1;
 
-                        if (hwif->ide_dma_on)
+                        if (hwif->dma_host_set)
                                 ide_set_dma(drive);
                 }
         }
@@ -848,25 +843,6 @@ static void probe_hwif(ide_hwif_t *hwif)
         }
 }
 
-static int hwif_init(ide_hwif_t *hwif);
-static void hwif_register_devices(ide_hwif_t *hwif);
-
-static int probe_hwif_init(ide_hwif_t *hwif)
-{
-        probe_hwif(hwif);
-
-        if (!hwif_init(hwif)) {
-                printk(KERN_INFO "%s: failed to initialize IDE interface\n",
-                                 hwif->name);
-                return -1;
-        }
-
-        if (hwif->present)
-                hwif_register_devices(hwif);
-
-        return 0;
-}
-
 #if MAX_HWIFS > 1
 /*
  * save_match() is used to simplify logic in init_irq() below.
@@ -1359,54 +1335,63 @@ static void hwif_register_devices(ide_hwif_t *hwif)
         }
 }
 
-int ideprobe_init (void)
+int ide_device_add_all(u8 *idx)
 {
-        unsigned int index;
-        int probe[MAX_HWIFS];
-
-        memset(probe, 0, MAX_HWIFS * sizeof(int));
-        for (index = 0; index < MAX_HWIFS; ++index)
-                probe[index] = !ide_hwifs[index].present;
-
-        for (index = 0; index < MAX_HWIFS; ++index)
-                if (probe[index])
-                        probe_hwif(&ide_hwifs[index]);
-        for (index = 0; index < MAX_HWIFS; ++index)
-                if (probe[index])
-                        hwif_init(&ide_hwifs[index]);
-        for (index = 0; index < MAX_HWIFS; ++index) {
-                if (probe[index]) {
-                        ide_hwif_t *hwif = &ide_hwifs[index];
-                        if (!hwif->present)
-                                continue;
-                        if (hwif->chipset == ide_unknown || hwif->chipset == ide_forced)
-                                hwif->chipset = ide_generic;
-                        hwif_register_devices(hwif);
+        ide_hwif_t *hwif;
+        int i, rc = 0;
+
+        for (i = 0; i < MAX_HWIFS; i++) {
+                if (idx[i] == 0xff)
+                        continue;
+
+                probe_hwif(&ide_hwifs[idx[i]]);
+        }
+
+        for (i = 0; i < MAX_HWIFS; i++) {
+                if (idx[i] == 0xff)
+                        continue;
+
+                hwif = &ide_hwifs[idx[i]];
+
+                if (hwif_init(hwif) == 0) {
+                        printk(KERN_INFO "%s: failed to initialize IDE "
+                                         "interface\n", hwif->name);
+                        rc = -1;
+                        continue;
                 }
         }
-        for (index = 0; index < MAX_HWIFS; ++index)
-                if (probe[index])
-                        ide_proc_register_port(&ide_hwifs[index]);
-        return 0;
-}
 
-EXPORT_SYMBOL_GPL(ideprobe_init);
+        for (i = 0; i < MAX_HWIFS; i++) {
+                if (idx[i] == 0xff)
+                        continue;
 
-int ide_device_add(u8 idx[4])
-{
-        int i, rc = 0;
+                hwif = &ide_hwifs[idx[i]];
 
-        for (i = 0; i < 4; i++) {
-                if (idx[i] != 0xff)
-                        rc |= probe_hwif_init(&ide_hwifs[idx[i]]);
+                if (hwif->present) {
+                        if (hwif->chipset == ide_unknown ||
+                            hwif->chipset == ide_forced)
+                                hwif->chipset = ide_generic;
+                        hwif_register_devices(hwif);
+                }
         }
 
-        for (i = 0; i < 4; i++) {
+        for (i = 0; i < MAX_HWIFS; i++) {
                 if (idx[i] != 0xff)
                         ide_proc_register_port(&ide_hwifs[idx[i]]);
         }
 
         return rc;
 }
+EXPORT_SYMBOL_GPL(ide_device_add_all);
+
+int ide_device_add(u8 idx[4])
+{
+        u8 idx_all[MAX_HWIFS];
+        int i;
 
+        for (i = 0; i < MAX_HWIFS; i++)
+                idx_all[i] = (i < 4) ? idx[i] : 0xff;
+
+        return ide_device_add_all(idx_all);
+}
 EXPORT_SYMBOL_GPL(ide_device_add);