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>

2 files changed, 6 insertions, 12 deletions

diff --git a/drivers/ide/mips/au1xxx-ide.c b/drivers/ide/mips/au1xxx-ide.c
index 903c628bddd0..11b7f61aae40 100644
--- a/drivers/ide/mips/au1xxx-ide.c
+++ b/drivers/ide/mips/au1xxx-ide.c
@@ -609,13 +609,9 @@ static int au_ide_probe(struct device *dev)
         hw.dev = dev;
         hw.chipset = ide_au1xxx;
 
-        host = ide_host_alloc(&au1xxx_port_info, hws);
-        if (host == NULL) {
-                ret = -ENOENT;
+        ret = ide_host_add(&au1xxx_port_info, hws, &host);
+        if (ret)
                 goto out;
-        }
-
-        ide_host_register(host, &au1xxx_port_info, hws);
 
         auide_hwif.hwif = host->ports[0];
 
diff --git a/drivers/ide/mips/swarm.c b/drivers/ide/mips/swarm.c
index b12d9d224831..badf79fc9e3a 100644
--- a/drivers/ide/mips/swarm.c
+++ b/drivers/ide/mips/swarm.c
@@ -75,7 +75,7 @@ static int __devinit swarm_ide_probe(struct device *dev)
         u8 __iomem *base;
         struct ide_host *host;
         phys_t offset, size;
-        int i;
+        int i, rc;
         hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };
 
         if (!SIBYTE_HAVE_IDE)
@@ -115,19 +115,17 @@ static int __devinit swarm_ide_probe(struct device *dev)
         hw.irq = K_INT_GB_IDE;
         hw.chipset = ide_generic;
 
-        host = ide_host_alloc(&swarm_port_info, hws);
-        if (host == NULL)
+        rc = ide_host_add(&swarm_port_info, hws, &host);
+        if (rc)
                 goto err;
 
-        ide_host_register(host, &swarm_port_info, hws);
-
         dev_set_drvdata(dev, host);
 
         return 0;
 err:
         release_resource(&swarm_ide_resource);
         iounmap(base);
-        return -ENOMEM;
+        return rc;
 }
 
 static struct device_driver swarm_ide_driver = {