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/legacy/buddha.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/legacy/buddha.c')
-rw-r--r-- | drivers/ide/legacy/buddha.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/ide/legacy/buddha.c b/drivers/ide/legacy/buddha.c index 2625667fab4c..7c2afa97f417 100644 --- a/drivers/ide/legacy/buddha.c +++ b/drivers/ide/legacy/buddha.c | |||
@@ -151,7 +151,6 @@ static void __init buddha_setup_ports(hw_regs_t *hw, unsigned long base, | |||
151 | static int __init buddha_init(void) | 151 | static int __init buddha_init(void) |
152 | { | 152 | { |
153 | struct zorro_dev *z = NULL; | 153 | struct zorro_dev *z = NULL; |
154 | struct ide_host *host; | ||
155 | u_long buddha_board = 0; | 154 | u_long buddha_board = 0; |
156 | BuddhaType type; | 155 | BuddhaType type; |
157 | int buddha_num_hwifs, i; | 156 | int buddha_num_hwifs, i; |
@@ -226,9 +225,7 @@ fail_base2: | |||
226 | hws[i] = &hw[i]; | 225 | hws[i] = &hw[i]; |
227 | } | 226 | } |
228 | 227 | ||
229 | host = ide_host_alloc(NULL, hws); | 228 | ide_host_add(NULL, hws, NULL); |
230 | if (host) | ||
231 | ide_host_register(host, NULL, hws); | ||
232 | } | 229 | } |
233 | 230 | ||
234 | return 0; | 231 | return 0; |