diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-07-23 13:55:57 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-07-23 13:55:57 -0400 |
commit | 6f904d015262dfa43eb1cecc00b0998b4c3543f2 (patch) | |
tree | d12a5818072d04525db6eb2d74668ba03bdead2d /drivers/ide/ppc | |
parent | 48c3c1072651922ed153bcf0a33ea82cf20df390 (diff) |
ide: add ide_host_add() helper
Add ide_host_add() helper which does ide_host_alloc()+ide_host_register(),
then convert ide_setup_pci_device[s](), ide_legacy_device_add() and some
host drivers to use it.
While at it:
* Fix ide_setup_pci_device[s](), ide_arm.c, gayle.c, ide-4drives.c,
macide.c, q40ide.c, cmd640.c and cs5520.c to return correct error value.
* -ENOENT -> -ENOMEM in rapide.c, ide-h8300.c, ide-generic.c, au1xxx-ide.c
and pmac.c
* -ENODEV -> -ENOMEM in palm_bk3710.c, ide_platform.c and delkin_cb.c
* -1 -> -ENOMEM in ide-pnp.c
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ppc')
-rw-r--r-- | drivers/ide/ppc/pmac.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c index ecd2f28da1ba..c521bf6e1bf2 100644 --- a/drivers/ide/ppc/pmac.c +++ b/drivers/ide/ppc/pmac.c | |||
@@ -1043,6 +1043,7 @@ static int __devinit pmac_ide_setup_device(pmac_ide_hwif_t *pmif, hw_regs_t *hw) | |||
1043 | ide_hwif_t *hwif; | 1043 | ide_hwif_t *hwif; |
1044 | hw_regs_t *hws[] = { hw, NULL, NULL, NULL }; | 1044 | hw_regs_t *hws[] = { hw, NULL, NULL, NULL }; |
1045 | struct ide_port_info d = pmac_port_info; | 1045 | struct ide_port_info d = pmac_port_info; |
1046 | int rc; | ||
1046 | 1047 | ||
1047 | pmif->broken_dma = pmif->broken_dma_warn = 0; | 1048 | pmif->broken_dma = pmif->broken_dma_warn = 0; |
1048 | if (of_device_is_compatible(np, "shasta-ata")) { | 1049 | if (of_device_is_compatible(np, "shasta-ata")) { |
@@ -1118,11 +1119,9 @@ static int __devinit pmac_ide_setup_device(pmac_ide_hwif_t *pmif, hw_regs_t *hw) | |||
1118 | pmif->mdev ? "macio" : "PCI", pmif->aapl_bus_id, | 1119 | pmif->mdev ? "macio" : "PCI", pmif->aapl_bus_id, |
1119 | pmif->mediabay ? " (mediabay)" : "", hw->irq); | 1120 | pmif->mediabay ? " (mediabay)" : "", hw->irq); |
1120 | 1121 | ||
1121 | host = ide_host_alloc(&d, hws); | 1122 | rc = ide_host_add(&d, hws, &host); |
1122 | if (host == NULL) | 1123 | if (rc) |
1123 | return -ENOENT; | 1124 | return rc; |
1124 | |||
1125 | ide_host_register(host, &d, hws); | ||
1126 | 1125 | ||
1127 | hwif = host->ports[0]; | 1126 | hwif = host->ports[0]; |
1128 | 1127 | ||