leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ide: make probe_hwif() return an error value

Browse Source 
Make probe_hwif() return an error value.

While at it:

* Remove comment about MAX_DRIVES == 2 limitation (it is not special to
  probe_hwif(), it is a general assumption taken by a lot of IDE code).

* Rename probe_hwif() to 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 fbd130887a
commit 9d501529b6
3 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/ide/ide-iops.c
View File

@ -1166,7 +1166,7 @@ EXPORT_SYMBOL(ide_do_reset);
/* /*
* ide_wait_not_busy() waits for the currently selected device on the hwif * ide_wait_not_busy() waits for the currently selected device on the hwif
* to report a non-busy status, see comments in probe_hwif(). * to report a non-busy status, see comments in ide_probe_port().
*/ */
int ide_wait_not_busy(ide_hwif_t *hwif, unsigned long timeout) int ide_wait_not_busy(ide_hwif_t *hwif, unsigned long timeout)
{ {

16
drivers/ide/ide-probe.c
View File

@ -738,24 +738,20 @@ void ide_undecoded_slave(ide_drive_t *drive1)
EXPORT_SYMBOL_GPL(ide_undecoded_slave); EXPORT_SYMBOL_GPL(ide_undecoded_slave);
/* static int ide_probe_port(ide_hwif_t *hwif)
* This routine only knows how to look for drive units 0 and 1
* on an interface, so any setting of MAX_DRIVES > 2 won't work here.
*/
static void probe_hwif(ide_hwif_t *hwif)
{ {
unsigned long flags; unsigned long flags;
unsigned int irqd; unsigned int irqd;
int unit; int unit;
if (hwif->noprobe) if (hwif->noprobe)
return; return -EACCES;
if ((hwif->chipset != ide_4drives || !hwif->mate || !hwif->mate->present) && if ((hwif->chipset != ide_4drives || !hwif->mate || !hwif->mate->present) &&
(ide_hwif_request_regions(hwif))) { (ide_hwif_request_regions(hwif))) {
printk(KERN_ERR "%s: ports already in use, skipping probe\n", printk(KERN_ERR "%s: ports already in use, skipping probe\n",
hwif->name); hwif->name);
return; return -EBUSY;
} }
/* /*
@ -804,7 +800,7 @@ static void probe_hwif(ide_hwif_t *hwif)
if (!hwif->present) { if (!hwif->present) {
ide_hwif_release_regions(hwif); ide_hwif_release_regions(hwif);
return; return -ENODEV;
} }
for (unit = 0; unit < MAX_DRIVES; unit++) { for (unit = 0; unit < MAX_DRIVES; unit++) {
@ -840,6 +836,8 @@ static void probe_hwif(ide_hwif_t *hwif)
else else
drive->no_io_32bit = drive->id->dword_io ? 1 : 0; drive->no_io_32bit = drive->id->dword_io ? 1 : 0;
} }
return 0;
} }
#if MAX_HWIFS > 1 #if MAX_HWIFS > 1
@ -1311,7 +1309,7 @@ int ide_device_add_all(u8 *idx)
if (idx[i] == 0xff) if (idx[i] == 0xff)
continue; continue;
probe_hwif(&ide_hwifs[idx[i]]); (void)ide_probe_port(&ide_hwifs[idx[i]]);
} }
for (i = 0; i < MAX_HWIFS; i++) { for (i = 0; i < MAX_HWIFS; i++) {

4
drivers/ide/pci/ns87415.c
View File

@ -229,8 +229,8 @@ static void __devinit init_hwif_ns87415 (ide_hwif_t *hwif)
#ifdef __sparc_v9__ #ifdef __sparc_v9__
/* /*
* XXX: Reset the device, if we don't it will not respond * XXX: Reset the device, if we don't it will not respond to
* to SELECT_DRIVE() properly during first probe_hwif(). * SELECT_DRIVE() properly during first ide_probe_port().
*/ */
timeout = 10000; timeout = 10000;
outb(12, hwif->io_ports[IDE_CONTROL_OFFSET]); outb(12, hwif->io_ports[IDE_CONTROL_OFFSET]);