Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ide: move handling of I/O resources out of ide_probe_port()

Browse source 
Reserve/release I/O resources in ide_device_add_all() instead of
ide_probe_port().

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
Bartlomiej Zolnierkiewicz 2008-02-01 23:09:36 +01:00
parent 9d501529b6
commit 139ddfcab5
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
drivers/ide/ide-probe.c
View file

@ -747,13 +747,6 @@ static int ide_probe_port(ide_hwif_t *hwif)
if (hwif->noprobe) if (hwif->noprobe)
return -EACCES; return -EACCES;
if ((hwif->chipset != ide_4drives || !hwif->mate || !hwif->mate->present) &&
(ide_hwif_request_regions(hwif))) {
printk(KERN_ERR "%s: ports already in use, skipping probe\n",
hwif->name);
return -EBUSY;
}
/* /*
* We must always disable IRQ, as probe_for_drive will assert IRQ, but * We must always disable IRQ, as probe_for_drive will assert IRQ, but
* we'll install our IRQ driver much later... * we'll install our IRQ driver much later...
@ -798,10 +791,8 @@ static int ide_probe_port(ide_hwif_t *hwif)
if (irqd) if (irqd)
enable_irq(irqd); enable_irq(irqd);
if (!hwif->present) { if (!hwif->present)
ide_hwif_release_regions(hwif);
return -ENODEV; return -ENODEV;
}
for (unit = 0; unit < MAX_DRIVES; unit++) { for (unit = 0; unit < MAX_DRIVES; unit++) {
ide_drive_t *drive = &hwif->drives[unit]; ide_drive_t *drive = &hwif->drives[unit];
@ -1309,7 +1300,17 @@ int ide_device_add_all(u8 *idx)
if (idx[i] == 0xff) if (idx[i] == 0xff)
continue; continue;
(void)ide_probe_port(&ide_hwifs[idx[i]]); hwif = &ide_hwifs[idx[i]];
if ((hwif->chipset != ide_4drives || !hwif->mate ||
!hwif->mate->present) && ide_hwif_request_regions(hwif)) {
printk(KERN_ERR "%s: ports already in use, "
"skipping probe\n", hwif->name);
continue;
}
if (ide_probe_port(hwif) < 0)
ide_hwif_release_regions(hwif);
} }
for (i = 0; i < MAX_HWIFS; i++) { for (i = 0; i < MAX_HWIFS; i++) {