|
@@ -911,6 +911,23 @@ static int ide_init_queue(ide_drive_t *drive)
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+static void ide_add_drive_to_hwgroup(ide_drive_t *drive)
|
|
|
|
+{
|
|
|
|
+ ide_hwgroup_t *hwgroup = drive->hwif->hwgroup;
|
|
|
|
+
|
|
|
|
+ spin_lock_irq(&ide_lock);
|
|
|
|
+ if (!hwgroup->drive) {
|
|
|
|
+ /* first drive for hwgroup. */
|
|
|
|
+ drive->next = drive;
|
|
|
|
+ hwgroup->drive = drive;
|
|
|
|
+ hwgroup->hwif = HWIF(hwgroup->drive);
|
|
|
|
+ } else {
|
|
|
|
+ drive->next = hwgroup->drive->next;
|
|
|
|
+ hwgroup->drive->next = drive;
|
|
|
|
+ }
|
|
|
|
+ spin_unlock_irq(&ide_lock);
|
|
|
|
+}
|
|
|
|
+
|
|
/*
|
|
/*
|
|
* This routine sets up the irq for an ide interface, and creates a new
|
|
* This routine sets up the irq for an ide interface, and creates a new
|
|
* hwgroup for the irq/hwif if none was previously assigned.
|
|
* hwgroup for the irq/hwif if none was previously assigned.
|
|
@@ -1033,17 +1050,7 @@ static int init_irq (ide_hwif_t *hwif)
|
|
printk(KERN_ERR "ide: failed to init %s\n",drive->name);
|
|
printk(KERN_ERR "ide: failed to init %s\n",drive->name);
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
- spin_lock_irq(&ide_lock);
|
|
|
|
- if (!hwgroup->drive) {
|
|
|
|
- /* first drive for hwgroup. */
|
|
|
|
- drive->next = drive;
|
|
|
|
- hwgroup->drive = drive;
|
|
|
|
- hwgroup->hwif = HWIF(hwgroup->drive);
|
|
|
|
- } else {
|
|
|
|
- drive->next = hwgroup->drive->next;
|
|
|
|
- hwgroup->drive->next = drive;
|
|
|
|
- }
|
|
|
|
- spin_unlock_irq(&ide_lock);
|
|
|
|
|
|
+ ide_add_drive_to_hwgroup(drive);
|
|
}
|
|
}
|
|
|
|
|
|
#if !defined(__mc68000__) && !defined(CONFIG_APUS)
|
|
#if !defined(__mc68000__) && !defined(CONFIG_APUS)
|