ide: use ide_legacy_device_add() for qd65xx (take 2)

* Add 'unsigned long config' argument to ide_legacy_device_add()
  for setting hwif->config_data.

* Use ide_find_port_slot() instead of ide_find_port() in
  ide_legacy_device_add().

* Handle IDE_HFLAG_QD_2ND_PORT and IDE_HFLAG_SINGLE host flags in
  ide_legacy_device_add().

* Convert qd65xx host driver to use ide_legacy_device_add().

v2:
* Update ali14xx, dtc2278, ht6560b and umc8672 host drivers.

There should be no functional changes caused by this patch.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

1 files changed, 14 insertions, 5 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;
         }