|
@@ -928,6 +928,31 @@ static void ide_add_drive_to_hwgroup(ide_drive_t *drive)
|
|
|
spin_unlock_irq(&ide_lock);
|
|
|
}
|
|
|
|
|
|
+/*
|
|
|
+ * For any present drive:
|
|
|
+ * - allocate the block device queue
|
|
|
+ * - link drive into the hwgroup
|
|
|
+ */
|
|
|
+static void ide_port_setup_devices(ide_hwif_t *hwif)
|
|
|
+{
|
|
|
+ int i;
|
|
|
+
|
|
|
+ for (i = 0; i < MAX_DRIVES; i++) {
|
|
|
+ ide_drive_t *drive = &hwif->drives[i];
|
|
|
+
|
|
|
+ if (!drive->present)
|
|
|
+ continue;
|
|
|
+
|
|
|
+ if (ide_init_queue(drive)) {
|
|
|
+ printk(KERN_ERR "ide: failed to init %s\n",
|
|
|
+ drive->name);
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+
|
|
|
+ ide_add_drive_to_hwgroup(drive);
|
|
|
+ }
|
|
|
+}
|
|
|
+
|
|
|
/*
|
|
|
* This routine sets up the irq for an ide interface, and creates a new
|
|
|
* hwgroup for the irq/hwif if none was previously assigned.
|
|
@@ -1037,22 +1062,6 @@ static int init_irq (ide_hwif_t *hwif)
|
|
|
hwif->rqsize = 65536;
|
|
|
}
|
|
|
|
|
|
- /*
|
|
|
- * For any present drive:
|
|
|
- * - allocate the block device queue
|
|
|
- * - link drive into the hwgroup
|
|
|
- */
|
|
|
- for (index = 0; index < MAX_DRIVES; ++index) {
|
|
|
- ide_drive_t *drive = &hwif->drives[index];
|
|
|
- if (!drive->present)
|
|
|
- continue;
|
|
|
- if (ide_init_queue(drive)) {
|
|
|
- printk(KERN_ERR "ide: failed to init %s\n",drive->name);
|
|
|
- continue;
|
|
|
- }
|
|
|
- ide_add_drive_to_hwgroup(drive);
|
|
|
- }
|
|
|
-
|
|
|
#if !defined(__mc68000__) && !defined(CONFIG_APUS)
|
|
|
printk("%s at 0x%03lx-0x%03lx,0x%03lx on irq %d", hwif->name,
|
|
|
hwif->io_ports[IDE_DATA_OFFSET],
|
|
@@ -1066,6 +1075,9 @@ static int init_irq (ide_hwif_t *hwif)
|
|
|
printk(" (%sed with %s)",
|
|
|
hwif->sharing_irq ? "shar" : "serializ", match->name);
|
|
|
printk("\n");
|
|
|
+
|
|
|
+ ide_port_setup_devices(hwif);
|
|
|
+
|
|
|
mutex_unlock(&ide_cfg_mtx);
|
|
|
return 0;
|
|
|
out_unlink:
|