diff options
| author | Bartlomiej Zolnierkiewicz | 2008-02-01 23:09:36 +0100 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz | 2008-02-01 23:09:36 +0100 |
| commit | 139ddfcab50e5eabcc88341c8743a990ac1be6a2 (patch) | |
| tree | cbe352f976ccd77976b717f49a42cbc839cfb3a5 /drivers/ide/ide-probe.c | |
| parent | ide: make probe_hwif() return an error value (diff) | |
| download | kernel-qcow2-linux-139ddfcab50e5eabcc88341c8743a990ac1be6a2.tar.gz kernel-qcow2-linux-139ddfcab50e5eabcc88341c8743a990ac1be6a2.tar.xz kernel-qcow2-linux-139ddfcab50e5eabcc88341c8743a990ac1be6a2.zip | |
ide: move handling of I/O resources out of ide_probe_port()
Reserve/release I/O resources in ide_device_add_all() instead of
ide_probe_port().
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-probe.c')
| -rw-r--r-- | drivers/ide/ide-probe.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c index 2395498fbc7b..7203d0e48161 100644 --- a/drivers/ide/ide-probe.c +++ b/drivers/ide/ide-probe.c @@ -747,13 +747,6 @@ static int ide_probe_port(ide_hwif_t *hwif) if (hwif->noprobe) 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'll install our IRQ driver much later... @@ -798,10 +791,8 @@ static int ide_probe_port(ide_hwif_t *hwif) if (irqd) enable_irq(irqd); - if (!hwif->present) { - ide_hwif_release_regions(hwif); + if (!hwif->present) return -ENODEV; - } for (unit = 0; unit < MAX_DRIVES; unit++) { ide_drive_t *drive = &hwif->drives[unit]; @@ -1309,7 +1300,17 @@ int ide_device_add_all(u8 *idx) if (idx[i] == 0xff) 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++) { |