diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-17 18:46:23 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-04-17 18:46:23 -0400 |
commit | 2dde7861afa23cd59db83515cb0b810b92b220aa (patch) | |
tree | e2cfda1c75d2157fde3801d29e2bcbebf1d5a129 /drivers/ide/ide-probe.c | |
parent | 26042d058ba21305aeb8ac92e4b1483dbec642ac (diff) |
ide: rework PowerMac media-bay support (take 2)
Rework PowerMac media-bay support in such way that instead of
un/registering the IDE interface we un/register IDE devices:
* Add ide_port_scan() helper for probing+registerering devices on a port.
* Rename ide_port_unregister_devices() to __ide_port_unregister_devices().
* Add ide_port_unregister_devices() helper for unregistering devices on a port.
* Add 'ide_hwif_t *cd_port' to 'struct media_bay_info', pass 'hwif' instead
of hwif->index to media_bay_set_ide_infos() and use it to setup 'cd_port'.
* Use ide_port_unregister_devices() instead of ide_unregister()
and ide_port_scan() instead of ide_register_hw() in media_bay_step().
* Unexport ide_register_hw() and make it static.
v2:
* Fix build by adding <linux/ide.h> include to <asm-powerpc/mediabay.h>.
(Reported by Michael/Kamalesh/Andrew).
Cc: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Cc: Michael Ellerman <michael@ellerman.id.au>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-probe.c')
-rw-r--r-- | drivers/ide/ide-probe.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c index f3ee098b69c7..468c4ac4181d 100644 --- a/drivers/ide/ide-probe.c +++ b/drivers/ide/ide-probe.c | |||
@@ -1494,3 +1494,21 @@ int ide_device_add(u8 idx[4], const struct ide_port_info *d) | |||
1494 | return ide_device_add_all(idx_all, d); | 1494 | return ide_device_add_all(idx_all, d); |
1495 | } | 1495 | } |
1496 | EXPORT_SYMBOL_GPL(ide_device_add); | 1496 | EXPORT_SYMBOL_GPL(ide_device_add); |
1497 | |||
1498 | void ide_port_scan(ide_hwif_t *hwif) | ||
1499 | { | ||
1500 | ide_port_cable_detect(hwif); | ||
1501 | ide_port_init_devices(hwif); | ||
1502 | |||
1503 | if (ide_probe_port(hwif) < 0) | ||
1504 | return; | ||
1505 | |||
1506 | hwif->present = 1; | ||
1507 | |||
1508 | ide_port_tune_devices(hwif); | ||
1509 | ide_acpi_port_init_devices(hwif); | ||
1510 | ide_port_setup_devices(hwif); | ||
1511 | hwif_register_devices(hwif); | ||
1512 | ide_proc_port_register_devices(hwif); | ||
1513 | } | ||
1514 | EXPORT_SYMBOL_GPL(ide_port_scan); | ||