Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-24 05:02:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

ide: factor out code unregistering devices from ide_unregister()

Browse Source 
Factor out code unregistering devices from ide_unregister() to
ide_port_unregister_devices().

Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
Bartlomiej Zolnierkiewicz 2008-04-18 00:46:22 +02:00
parent 5b0c4b30a6
commit 71bf9f6fe8
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
drivers/ide/ide.c
View File

@ -490,6 +490,23 @@ void ide_remove_port_from_hwgroup(ide_hwif_t *hwif)
spin_unlock_irq(&ide_lock); spin_unlock_irq(&ide_lock);
} }
/* Called with ide_lock held. */
static void ide_port_unregister_devices(ide_hwif_t *hwif)
{
int i;
for (i = 0; i < MAX_DRIVES; i++) {
ide_drive_t *drive = &hwif->drives[i];
if (drive->present) {
spin_unlock_irq(&ide_lock);
device_unregister(&drive->gendev);
wait_for_completion(&drive->gendev_rel_comp);
spin_lock_irq(&ide_lock);
}
}
}
/** /**
* ide_unregister - free an IDE interface * ide_unregister - free an IDE interface
* @index: index of interface (will change soon to a pointer) * @index: index of interface (will change soon to a pointer)
@ -516,11 +533,10 @@ void ide_remove_port_from_hwgroup(ide_hwif_t *hwif)
void ide_unregister(unsigned int index, int init_default, int restore) void ide_unregister(unsigned int index, int init_default, int restore)
{ {
ide_drive_t *drive;
ide_hwif_t *hwif, *g; ide_hwif_t *hwif, *g;
static ide_hwif_t tmp_hwif; /* protected by ide_cfg_mtx */ static ide_hwif_t tmp_hwif; /* protected by ide_cfg_mtx */
ide_hwgroup_t *hwgroup; ide_hwgroup_t *hwgroup;
int irq_count = 0, unit; int irq_count = 0;
BUG_ON(index >= MAX_HWIFS); BUG_ON(index >= MAX_HWIFS);
@ -531,15 +547,7 @@ void ide_unregister(unsigned int index, int init_default, int restore)
hwif = &ide_hwifs[index]; hwif = &ide_hwifs[index];
if (!hwif->present) if (!hwif->present)
goto abort; goto abort;
for (unit = 0; unit < MAX_DRIVES; ++unit) { ide_port_unregister_devices(hwif);
drive = &hwif->drives[unit];
if (!drive->present)
continue;
spin_unlock_irq(&ide_lock);
device_unregister(&drive->gendev);
wait_for_completion(&drive->gendev_rel_comp);
spin_lock_irq(&ide_lock);
}
hwif->present = 0; hwif->present = 0;
spin_unlock_irq(&ide_lock); spin_unlock_irq(&ide_lock);