7 files changed, 26 insertions, 61 deletions

diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index 8cad2b4c694f..ba16ade15c8c 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -1634,7 +1634,7 @@ void ide_port_scan(ide_hwif_t *hwif)
 }
 EXPORT_SYMBOL_GPL(ide_port_scan);
 
-int ide_legacy_device_add(const struct ide_port_info *d)
+int ide_legacy_device_add(const struct ide_port_info *d, unsigned long config)
 {
         ide_hwif_t *hwif, *mate;
         u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
@@ -1648,15 +1648,24 @@ int ide_legacy_device_add(const struct ide_port_info *d)
         ide_std_init_ports(&hw[1], 0x170, 0x376);
         hw[1].irq = 15;
 
-        hwif = ide_find_port();
+        hwif = ide_find_port_slot(d);
         if (hwif) {
-                ide_init_port_hw(hwif, &hw[0]);
-                idx[0] = hwif->index;
+                u8 j = (d->host_flags & IDE_HFLAG_QD_2ND_PORT) ? 1 : 0;
+
+                ide_init_port_hw(hwif, &hw[j]);
+                if (config)
+                        hwif->config_data = config;
+                idx[j] = hwif->index;
         }
 
-        mate = ide_find_port();
+        if (hwif == NULL && (d->host_flags & IDE_HFLAG_SINGLE))
+                return -ENOENT;
+
+        mate = ide_find_port_slot(d);
         if (mate) {
                 ide_init_port_hw(mate, &hw[1]);
+                if (config)
+                        mate->config_data = config;
                 idx[1] = mate->index;
         }
 
diff --git a/drivers/ide/legacy/ali14xx.c b/drivers/ide/legacy/ali14xx.c
index 24bd7838aec5..7bfb28edf511 100644
--- a/drivers/ide/legacy/ali14xx.c
+++ b/drivers/ide/legacy/ali14xx.c
@@ -214,7 +214,7 @@ static int __init ali14xx_probe(void)
                 return 1;
         }
 
-        return ide_legacy_device_add(&ali14xx_port_info);
+        return ide_legacy_device_add(&ali14xx_port_info, 0);
 }
 
 int probe_ali14xx;
diff --git a/drivers/ide/legacy/dtc2278.c b/drivers/ide/legacy/dtc2278.c
index 92d119ba92af..7b5585c1c4c0 100644
--- a/drivers/ide/legacy/dtc2278.c
+++ b/drivers/ide/legacy/dtc2278.c
@@ -125,7 +125,7 @@ static int __init dtc2278_probe(void)
 #endif
         local_irq_restore(flags);
 
-        return ide_legacy_device_add(&dtc2278_port_info);
+        return ide_legacy_device_add(&dtc2278_port_info, 0);
 }
 
 int probe_dtc2278 = 0;
diff --git a/drivers/ide/legacy/ht6560b.c b/drivers/ide/legacy/ht6560b.c
index e4e38c3cd8ac..558964fc994e 100644
--- a/drivers/ide/legacy/ht6560b.c
+++ b/drivers/ide/legacy/ht6560b.c
@@ -360,7 +360,7 @@ static int __init ht6560b_init(void)
                 goto release_region;
         }
 
-        return ide_legacy_device_add(&ht6560b_port_info);
+        return ide_legacy_device_add(&ht6560b_port_info, 0);
 
 release_region:
         release_region(HT_CONFIG_PORT, 1);
diff --git a/drivers/ide/legacy/qd65xx.c b/drivers/ide/legacy/qd65xx.c
index 65f098d15154..d8a05b57277b 100644
--- a/drivers/ide/legacy/qd65xx.c
+++ b/drivers/ide/legacy/qd65xx.c
@@ -333,10 +333,8 @@ static const struct ide_port_info qd65xx_port_info __initdata = {
 
 static int __init qd_probe(int base)
 {
-        ide_hwif_t *hwif;
+        int rc;
         u8 config, unit;
-        u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
-        hw_regs_t hw[2];
         struct ide_port_info d = qd65xx_port_info;
 
         config = inb(QD_CONFIG_PORT);
@@ -349,14 +347,6 @@ static int __init qd_probe(int base)
         if (unit)
                 d.host_flags |= IDE_HFLAG_QD_2ND_PORT;
 
-        memset(&hw, 0, sizeof(hw));
-
-        ide_std_init_ports(&hw[0], 0x1f0, 0x3f6);
-        hw[0].irq = 14;
-
-        ide_std_init_ports(&hw[1], 0x170, 0x376);
-        hw[1].irq = 15;
-
         if ((config & 0xf0) == QD_CONFIG_QD6500) {
 
                 if (qd_testreg(base))
@@ -376,19 +366,9 @@ static int __init qd_probe(int base)
                 d.port_ops = &qd6500_port_ops;
                 d.host_flags |= IDE_HFLAG_SINGLE;
 
-                hwif = ide_find_port_slot(&d);
-                if (hwif == NULL)
-                        return -ENOENT;
-
-                ide_init_port_hw(hwif, &hw[unit]);
+                rc = ide_legacy_device_add(&d, (base << 8) | config);
 
-                hwif->config_data = (base << 8) | config;
-
-                idx[unit] = hwif->index;
-
-                ide_device_add(idx, &d);
-
-                return 1;
+                return (rc == 0) ? 1 : rc;
         }
 
         if (((config & 0xf0) == QD_CONFIG_QD6580_A) ||
@@ -418,40 +398,16 @@ static int __init qd_probe(int base)
 
                         d.host_flags |= IDE_HFLAG_SINGLE;
 
-                        hwif = ide_find_port_slot(&d);
-                        if (hwif == NULL)
-                                return -ENOENT;
+                        rc = ide_legacy_device_add(&d, (base << 8) | config);
 
-                        ide_init_port_hw(hwif, &hw[unit]);
-
-                        hwif->config_data = (base << 8) | config;
-
-                        idx[unit] = hwif->index;
-
-                        ide_device_add(idx, &d);
-
-                        return 1;
+                        return (rc == 0) ? 1 : rc;
                 } else {
-                        ide_hwif_t *mate;
-
                         /* secondary enabled */
                         printk(KERN_INFO "qd6580: dual IDE board\n");
 
-                        hwif = ide_find_port();
-                        if (hwif) {
-                                ide_init_port_hw(hwif, &hw[0]);
-                                idx[0] = hwif->index;
-                        }
-
-                        mate = ide_find_port();
-                        if (mate) {
-                                ide_init_port_hw(mate, &hw[1]);
-                                idx[1] = mate->index;
-                        }
-
-                        ide_device_add(idx, &d);
+                        rc = ide_legacy_device_add(&d, (base << 8) | config);
 
-                        return 0; /* no other qd65xx possible */
+                        return rc; /* no other qd65xx possible */
                 }
         }
         /* no qd65xx found */
diff --git a/drivers/ide/legacy/umc8672.c b/drivers/ide/legacy/umc8672.c
index b48ee345f817..95c643a2228a 100644
--- a/drivers/ide/legacy/umc8672.c
+++ b/drivers/ide/legacy/umc8672.c
@@ -152,7 +152,7 @@ static int __init umc8672_probe(void)
         umc_set_speeds(current_speeds);
         local_irq_restore(flags);
 
-        return ide_legacy_device_add(&umc8672_port_info);
+        return ide_legacy_device_add(&umc8672_port_info, 0);
 }
 
 int probe_umc8672;
diff --git a/include/linux/ide.h b/include/linux/ide.h
index 68e5a009fbd0..db9a70e25377 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -1213,7 +1213,7 @@ void ide_undecoded_slave(ide_drive_t *);
 
 int ide_device_add_all(u8 *idx, const struct ide_port_info *);
 int ide_device_add(u8 idx[4], const struct ide_port_info *);
-int ide_legacy_device_add(const struct ide_port_info *);
+int ide_legacy_device_add(const struct ide_port_info *, unsigned long);
 void ide_port_unregister_devices(ide_hwif_t *);
 void ide_port_scan(ide_hwif_t *);