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/pci/delkin_cb.c | |
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/pci/delkin_cb.c')
-rw-r--r-- | drivers/ide/pci/delkin_cb.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/ide/pci/delkin_cb.c b/drivers/ide/pci/delkin_cb.c index 5eb9d9325184..f84bfb4f600f 100644 --- a/drivers/ide/pci/delkin_cb.c +++ b/drivers/ide/pci/delkin_cb.c | |||
@@ -86,12 +86,10 @@ delkin_cb_probe (struct pci_dev *dev, const struct pci_device_id *id) | |||
86 | hw.dev = &dev->dev; | 86 | hw.dev = &dev->dev; |
87 | hw.chipset = ide_pci; /* this enables IRQ sharing */ | 87 | hw.chipset = ide_pci; /* this enables IRQ sharing */ |
88 | 88 | ||
89 | host = ide_host_alloc(&delkin_cb_port_info, hws); | 89 | rc = ide_host_add(&delkin_cb_port_info, hws, &host); |
90 | if (host == NULL) | 90 | if (rc) |
91 | goto out_disable; | 91 | goto out_disable; |
92 | 92 | ||
93 | ide_host_register(host, &delkin_cb_port_info, hws); | ||
94 | |||
95 | pci_set_drvdata(dev, host); | 93 | pci_set_drvdata(dev, host); |
96 | 94 | ||
97 | return 0; | 95 | return 0; |
@@ -99,7 +97,7 @@ delkin_cb_probe (struct pci_dev *dev, const struct pci_device_id *id) | |||
99 | out_disable: | 97 | out_disable: |
100 | pci_release_regions(dev); | 98 | pci_release_regions(dev); |
101 | pci_disable_device(dev); | 99 | pci_disable_device(dev); |
102 | return -ENODEV; | 100 | return rc; |
103 | } | 101 | } |
104 | 102 | ||
105 | static void | 103 | static void |