mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-24 01:41:39 +00:00
ide: factor out adding drive to hwgroup from init_irq()
Factor out adding drive to hwgroup from init_irq() to ide_add_drive_to_hwgroup(). There should be no functionality changes caused by this patch. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
parent
8a0e7e14a2
commit
0947e0dcd6
1 changed files with 18 additions and 11 deletions
|
@ -911,6 +911,23 @@ static int ide_init_queue(ide_drive_t *drive)
|
|||
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
|
||||
* 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);
|
||||
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)
|
||||
|
|
Loading…
Reference in a new issue