Skip to contentSkip to conversation

ide: use ide_legacy_device_add() for qd65xx

PATCH New Bartlomiej Zolnierkiewicz 1 participant 1 message Feb 27, 2008 libata

lore
Share & tools
lore
#0 lore raw

PATCH 3/4 ide: use ide_legacy_device_add() for qd65xx

* 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().

There should be no functional changes caused by this patch.

---
 drivers/ide/ide-probe.c     |   19 ++++++++++----
 drivers/ide/legacy/qd65xx.c |   58 +++++---------------------------------------
 include/linux/ide.h         |    2 -
 3 files changed, 22 insertions(+), 57 deletions(-)
drivers/ide/ide-probe.c +14 -5
Index: b/drivers/ide/ide-probe.c
===================================================================
@@ -1630,7 +1630,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 };
@@ -1644,15 +1644,24 @@ int ide_legacy_device_add(const struct i
 	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;
 	}
 
drivers/ide/legacy/qd65xx.c +7 -51

90 lines not on this page · raw message

include/linux/ide.h +1 -1
Index: b/include/linux/ide.h
===================================================================
@@ -1215,7 +1215,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 *);