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/h8300 | |
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/h8300')
-rw-r--r-- | drivers/ide/h8300/ide-h8300.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/ide/h8300/ide-h8300.c b/drivers/ide/h8300/ide-h8300.c index 15f76690a48c..bde7a585f198 100644 --- a/drivers/ide/h8300/ide-h8300.c +++ b/drivers/ide/h8300/ide-h8300.c | |||
@@ -191,7 +191,6 @@ static const struct ide_port_info h8300_port_info = { | |||
191 | 191 | ||
192 | static int __init h8300_ide_init(void) | 192 | static int __init h8300_ide_init(void) |
193 | { | 193 | { |
194 | struct ide_host *host; | ||
195 | hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL }; | 194 | hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL }; |
196 | 195 | ||
197 | printk(KERN_INFO DRV_NAME ": H8/300 generic IDE interface\n"); | 196 | printk(KERN_INFO DRV_NAME ": H8/300 generic IDE interface\n"); |
@@ -205,13 +204,7 @@ static int __init h8300_ide_init(void) | |||
205 | 204 | ||
206 | hw_setup(&hw); | 205 | hw_setup(&hw); |
207 | 206 | ||
208 | host = ide_host_alloc(&h8300_port_info, hws); | 207 | return ide_host_add(&h8300_port_info, hws, NULL); |
209 | if (host == NULL) | ||
210 | return -ENOENT; | ||
211 | |||
212 | ide_host_register(host, &h8300_port_info, hws); | ||
213 | |||
214 | return 0; | ||
215 | 208 | ||
216 | out_busy: | 209 | out_busy: |
217 | printk(KERN_ERR "ide-h8300: IDE I/F resource already used.\n"); | 210 | printk(KERN_ERR "ide-h8300: IDE I/F resource already used.\n"); |