4 files changed, 9 insertions, 23 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)
  */
 static int __init cmd640x_init(void)
 {
-        struct ide_host *host;
         int second_port_cmd640 = 0, rc;
         const char *bus_type, *port2;
         u8 b, cfr;
@@ -829,11 +828,7 @@ static int __init cmd640x_init(void)
         cmd640_dump_regs();
 #endif
 
-        host = ide_host_alloc(&cmd640_port_info, hws);
-        if (host)
-                ide_host_register(host, &cmd640_port_info, hws);
-
-        return 1;
+        return ide_host_add(&cmd640_port_info, hws, NULL);
 }
 
 module_param_named(probe_vlb, cmd640_vlb, bool, 0);
diff --git a/drivers/ide/pci/cs5520.c b/drivers/ide/pci/cs5520.c
index b8ec06d22c61..b03d8ae947e6 100644
--- a/drivers/ide/pci/cs5520.c
+++ b/drivers/ide/pci/cs5520.c
@@ -114,7 +114,6 @@ static const struct ide_port_info cyrix_chipsets[] __devinitdata = {
  
 static int __devinit cs5520_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
-        struct ide_host *host;
         const struct ide_port_info *d = &cyrix_chipsets[id->driver_data];
         hw_regs_t hw[4], *hws[] = { NULL, NULL, NULL, NULL };
 
@@ -140,11 +139,7 @@ static int __devinit cs5520_init_one(struct pci_dev *dev, const struct pci_devic
 
         ide_pci_setup_ports(dev, d, 14, &hw[0], &hws[0]);
 
-        host = ide_host_alloc(d, hws);
-        if (host)
-                ide_host_register(host, d, hws);
-
-        return 0;
+        return ide_host_add(d, hws, NULL);
 }
 
 static const struct pci_device_id cs5520_pci_tbl[] = {
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)
         hw.dev = &dev->dev;
         hw.chipset = ide_pci;           /* this enables IRQ sharing */
 
-        host = ide_host_alloc(&delkin_cb_port_info, hws);
-        if (host == NULL)
+        rc = ide_host_add(&delkin_cb_port_info, hws, &host);
+        if (rc)
                 goto out_disable;
 
-        ide_host_register(host, &delkin_cb_port_info, hws);
-
         pci_set_drvdata(dev, host);
 
         return 0;
@@ -99,7 +97,7 @@ delkin_cb_probe (struct pci_dev *dev, const struct pci_device_id *id)
 out_disable:
         pci_release_regions(dev);
         pci_disable_device(dev);
-        return -ENODEV;
+        return rc;
 }
 
 static void
diff --git a/drivers/ide/pci/scc_pata.c b/drivers/ide/pci/scc_pata.c
index d5e2ba6bacd6..94a7ab864236 100644
--- a/drivers/ide/pci/scc_pata.c
+++ b/drivers/ide/pci/scc_pata.c
@@ -588,7 +588,7 @@ static int scc_ide_setup_pci_device(struct pci_dev *dev,
         struct scc_ports *ports = pci_get_drvdata(dev);
         struct ide_host *host;
         hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };
-        int i;
+        int i, rc;
 
         memset(&hw, 0, sizeof(hw));
         for (i = 0; i <= 8; i++)
@@ -597,11 +597,9 @@ static int scc_ide_setup_pci_device(struct pci_dev *dev,
         hw.dev = &dev->dev;
         hw.chipset = ide_pci;
 
-        host = ide_host_alloc(d, hws);
-        if (host == NULL)
-                return -ENOMEM;
-
-        ide_host_register(host, d, hws);
+        rc = ide_host_add(d, hws, &host);
+        if (rc)
+                return rc;
 
         ports->host = host;