diff options
| author | Bartlomiej Zolnierkiewicz | 2008-07-16 20:33:39 +0200 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz | 2008-07-16 20:33:39 +0200 |
| commit | 256c5f8eef7b9a8c8a85c15c58cda9df455f947e (patch) | |
| tree | cecc145a78f140de8e623b1563c4d758290e2ae8 /drivers/ide/ide-probe.c | |
| parent | ide: move PIO blacklist to ide-pio-blacklist.c (diff) | |
| download | kernel-qcow2-linux-256c5f8eef7b9a8c8a85c15c58cda9df455f947e.tar.gz kernel-qcow2-linux-256c5f8eef7b9a8c8a85c15c58cda9df455f947e.tar.xz kernel-qcow2-linux-256c5f8eef7b9a8c8a85c15c58cda9df455f947e.zip | |
ide: fix hwif-s initialization
* Add ide_hwifs[] entry initialization to ide_find_port_slot()
and remove ide_init_port_data() calls from host drivers.
* Unexport ide_init_port_data().
* Remove no longer needed init_ide_data().
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-probe.c')
| -rw-r--r-- | drivers/ide/ide-probe.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c index d21e51a02c3e..592d424412ea 100644 --- a/drivers/ide/ide-probe.c +++ b/drivers/ide/ide-probe.c @@ -1473,22 +1473,26 @@ ide_hwif_t *ide_find_port_slot(const struct ide_port_info *d) for (; i < MAX_HWIFS; i++) { hwif = &ide_hwifs[i]; if (hwif->chipset == ide_unknown) - return hwif; + goto out_found; } } else { for (i = 2; i < MAX_HWIFS; i++) { hwif = &ide_hwifs[i]; if (hwif->chipset == ide_unknown) - return hwif; + goto out_found; } for (i = 0; i < 2 && i < MAX_HWIFS; i++) { hwif = &ide_hwifs[i]; if (hwif->chipset == ide_unknown) - return hwif; + goto out_found; } } return NULL; + +out_found: + ide_init_port_data(hwif, i); + return hwif; } EXPORT_SYMBOL_GPL(ide_find_port_slot); |