aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide/pci/cmd640.c
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-07-23 13:55:57 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2008-07-23 13:55:57 -0400
commit6f904d015262dfa43eb1cecc00b0998b4c3543f2 (patch)
treed12a5818072d04525db6eb2d74668ba03bdead2d /drivers/ide/pci/cmd640.c
parent48c3c1072651922ed153bcf0a33ea82cf20df390 (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/cmd640.c')
-rw-r--r--drivers/ide/pci/cmd640.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/ide/pci/cmd640.c b/drivers/ide/pci/cmd640.c
index 013697b8cef4..e6c62006ca1a 100644
--- a/drivers/ide/pci/cmd640.c
+++ b/drivers/ide/pci/cmd640.c
@@ -709,7 +709,6 @@ static int cmd640x_init_one(unsigned long base, unsigned long ctl)
709 */ 709 */
710static int __init cmd640x_init(void) 710static int __init cmd640x_init(void)
711{ 711{
712 struct ide_host *host;
713 int second_port_cmd640 = 0, rc; 712 int second_port_cmd640 = 0, rc;
714 const char *bus_type, *port2; 713 const char *bus_type, *port2;
715 u8 b, cfr; 714 u8 b, cfr;
@@ -829,11 +828,7 @@ static int __init cmd640x_init(void)
829 cmd640_dump_regs(); 828 cmd640_dump_regs();
830#endif 829#endif
831 830
832 host = ide_host_alloc(&cmd640_port_info, hws); 831 return ide_host_add(&cmd640_port_info, hws, NULL);
833 if (host)
834 ide_host_register(host, &cmd640_port_info, hws);
835
836 return 1;
837} 832}
838 833
839module_param_named(probe_vlb, cmd640_vlb, bool, 0); 834module_param_named(probe_vlb, cmd640_vlb, bool, 0);