ide: pass number of ports to ide_host_{alloc,add}() (v2)

Pass number of ports to ide_host_{alloc,add}() and then update
all users accordingly.

v2:
- drop no longer needed NULL initializers in buddha.c, cmd640.c and gayle.c
  (noticed by Sergei)

There should be no functional changes caused by this patch.

Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

27 files changed, 61 insertions, 62 deletions

diff --git a/drivers/ide/at91_ide.c b/drivers/ide/at91_ide.c
index 8d39cc9bdf92..11fe1ffdff76 100644
--- a/drivers/ide/at91_ide.c
+++ b/drivers/ide/at91_ide.c
@@ -247,8 +247,7 @@ irqreturn_t at91_irq_handler(int irq, void *dev_id)
 static int __init at91_ide_probe(struct platform_device *pdev)
 {
         int ret;
-        hw_regs_t hw;
-        hw_regs_t *hws[] = { &hw, NULL, NULL, NULL };
+        hw_regs_t hw, *hws[] = { &hw };
         struct ide_host *host;
         struct resource *res;
         unsigned long tf_base = 0, ctl_base = 0;
@@ -307,7 +306,7 @@ static int __init at91_ide_probe(struct platform_device *pdev)
         hw.irq = board->irq_pin;
         hw.dev = &pdev->dev;
 
-        host = ide_host_alloc(&at91_ide_port_info, hws);
+        host = ide_host_alloc(&at91_ide_port_info, hws, 1);
         if (!host) {
                 perr("failed to allocate ide host\n");
                 return -ENOMEM;
diff --git a/drivers/ide/au1xxx-ide.c b/drivers/ide/au1xxx-ide.c
index 9b31f830e2f5..32f5be686018 100644
--- a/drivers/ide/au1xxx-ide.c
+++ b/drivers/ide/au1xxx-ide.c
@@ -508,7 +508,7 @@ static int au_ide_probe(struct platform_device *dev)
         struct resource *res;
         struct ide_host *host;
         int ret = 0;
-        hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };
+        hw_regs_t hw, *hws[] = { &hw };
 
 #if defined(CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA)
         char *mode = "MWDMA2";
@@ -550,7 +550,7 @@ static int au_ide_probe(struct platform_device *dev)
         hw.irq = ahwif->irq;
         hw.dev = &dev->dev;
 
-        ret = ide_host_add(&au1xxx_port_info, hws, &host);
+        ret = ide_host_add(&au1xxx_port_info, hws, 1, &host);
         if (ret)
                 goto out;
 
diff --git a/drivers/ide/buddha.c b/drivers/ide/buddha.c
index 9aa2cd9be310..0450652cdabb 100644
--- a/drivers/ide/buddha.c
+++ b/drivers/ide/buddha.c
@@ -160,7 +160,7 @@ static int __init buddha_init(void)
 
         while ((z = zorro_find_device(ZORRO_WILDCARD, z))) {
                 unsigned long board;
-                hw_regs_t hw[MAX_NUM_HWIFS], *hws[] = { NULL, NULL, NULL, NULL };
+                hw_regs_t hw[MAX_NUM_HWIFS], *hws[MAX_NUM_HWIFS];
 
                 if (z->id == ZORRO_PROD_INDIVIDUAL_COMPUTERS_BUDDHA) {
                         buddha_num_hwifs = BUDDHA_NUM_HWIFS;
@@ -224,7 +224,7 @@ fail_base2:
                         hws[i] = &hw[i];
                 }
 
-                ide_host_add(&buddha_port_info, hws, NULL);
+                ide_host_add(&buddha_port_info, hws, i, NULL);
         }
 
         return 0;
diff --git a/drivers/ide/cmd640.c b/drivers/ide/cmd640.c
index e862a2503ab0..edb3a7a35c80 100644
--- a/drivers/ide/cmd640.c
+++ b/drivers/ide/cmd640.c
@@ -708,7 +708,7 @@ static int __init cmd640x_init(void)
         int second_port_cmd640 = 0, rc;
         const char *bus_type, *port2;
         u8 b, cfr;
-        hw_regs_t hw[2], *hws[] = { NULL, NULL, NULL, NULL };
+        hw_regs_t hw[2], *hws[2];
 
         if (cmd640_vlb && probe_for_cmd640_vlb()) {
                 bus_type = "VLB";
@@ -822,7 +822,8 @@ static int __init cmd640x_init(void)
         cmd640_dump_regs();
 #endif
 
-        return ide_host_add(&cmd640_port_info, hws, NULL);
+        return ide_host_add(&cmd640_port_info, hws, second_port_cmd640 ? 2 : 1,
+                            NULL);
 }
 
 module_param_named(probe_vlb, cmd640_vlb, bool, 0);
diff --git a/drivers/ide/cs5520.c b/drivers/ide/cs5520.c
index 87987a7d36c9..a9023d7843f2 100644
--- a/drivers/ide/cs5520.c
+++ b/drivers/ide/cs5520.c
@@ -110,7 +110,7 @@ static const struct ide_port_info cyrix_chipset __devinitdata = {
 static int __devinit cs5520_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
         const struct ide_port_info *d = &cyrix_chipset;
-        hw_regs_t hw[4], *hws[] = { NULL, NULL, NULL, NULL };
+        hw_regs_t hw[2], *hws[] = { NULL, NULL };
 
         ide_setup_pci_noise(dev, d);
 
@@ -136,7 +136,7 @@ static int __devinit cs5520_init_one(struct pci_dev *dev, const struct pci_devic
         ide_pci_setup_ports(dev, d, &hw[0], &hws[0]);
         hw[0].irq = 14;
 
-        return ide_host_add(d, hws, NULL);
+        return ide_host_add(d, hws, 2, NULL);
 }
 
 static const struct pci_device_id cs5520_pci_tbl[] = {
diff --git a/drivers/ide/delkin_cb.c b/drivers/ide/delkin_cb.c
index a0de834a81c3..d4a76f22ed15 100644
--- a/drivers/ide/delkin_cb.c
+++ b/drivers/ide/delkin_cb.c
@@ -77,7 +77,7 @@ delkin_cb_probe (struct pci_dev *dev, const struct pci_device_id *id)
         struct ide_host *host;
         unsigned long base;
         int rc;
-        hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };
+        hw_regs_t hw, *hws[] = { &hw };
 
         rc = pci_enable_device(dev);
         if (rc) {
@@ -99,7 +99,7 @@ delkin_cb_probe (struct pci_dev *dev, const struct pci_device_id *id)
         hw.irq = dev->irq;
         hw.dev = &dev->dev;
 
-        rc = ide_host_add(&delkin_cb_port_info, hws, &host);
+        rc = ide_host_add(&delkin_cb_port_info, hws, 1, &host);
         if (rc)
                 goto out_disable;
 
diff --git a/drivers/ide/falconide.c b/drivers/ide/falconide.c
index 770cfa67bdc8..adb5b0cf7626 100644
--- a/drivers/ide/falconide.c
+++ b/drivers/ide/falconide.c
@@ -138,7 +138,7 @@ static void __init falconide_setup_ports(hw_regs_t *hw)
 static int __init falconide_init(void)
 {
         struct ide_host *host;
-        hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };
+        hw_regs_t hw, *hws[] = { &hw };
         int rc;
 
         if (!MACH_IS_ATARI || !ATARIHW_PRESENT(IDE))
@@ -153,7 +153,7 @@ static int __init falconide_init(void)
 
         falconide_setup_ports(&hw);
 
-        host = ide_host_alloc(&falconide_port_info, hws);
+        host = ide_host_alloc(&falconide_port_info, hws, 1);
         if (host == NULL) {
                 rc = -ENOMEM;
                 goto err;
diff --git a/drivers/ide/gayle.c b/drivers/ide/gayle.c
index 71db2f9c3361..253ff34afd8f 100644
--- a/drivers/ide/gayle.c
+++ b/drivers/ide/gayle.c
@@ -125,7 +125,7 @@ static int __init gayle_init(void)
     unsigned long base, ctrlport, irqport;
     ide_ack_intr_t *ack_intr;
     int a4000, i, rc;
-    hw_regs_t hw[GAYLE_NUM_HWIFS], *hws[] = { NULL, NULL, NULL, NULL };
+    hw_regs_t hw[GAYLE_NUM_HWIFS], *hws[GAYLE_NUM_HWIFS];
 
     if (!MACH_IS_AMIGA)
         return -ENODEV;
@@ -170,7 +170,7 @@ found:
         hws[i] = &hw[i];
     }
 
-    rc = ide_host_add(&gayle_port_info, hws, NULL);
+    rc = ide_host_add(&gayle_port_info, hws, i, NULL);
     if (rc)
         release_mem_region(res_start, res_n);
 
diff --git a/drivers/ide/icside.c b/drivers/ide/icside.c
index 6352a44ed179..6223b80beb35 100644
--- a/drivers/ide/icside.c
+++ b/drivers/ide/icside.c
@@ -410,7 +410,7 @@ icside_register_v5(struct icside_state *state, struct expansion_card *ec)
 {
         void __iomem *base;
         struct ide_host *host;
-        hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };
+        hw_regs_t hw, *hws[] = { &hw };
         int ret;
 
         base = ecardm_iomap(ec, ECARD_RES_MEMC, 0, 0);
@@ -431,7 +431,7 @@ icside_register_v5(struct icside_state *state, struct expansion_card *ec)
 
         icside_setup_ports(&hw, base, &icside_cardinfo_v5, ec);
 
-        host = ide_host_alloc(&icside_v5_port_info, hws);
+        host = ide_host_alloc(&icside_v5_port_info, hws, 1);
         if (host == NULL)
                 return -ENODEV;
 
@@ -467,7 +467,7 @@ icside_register_v6(struct icside_state *state, struct expansion_card *ec)
         struct ide_host *host;
         unsigned int sel = 0;
         int ret;
-        hw_regs_t hw[2], *hws[] = { &hw[0], &hw[1], NULL, NULL };
+        hw_regs_t hw[2], *hws[] = { &hw[0], &hw[1] };
         struct ide_port_info d = icside_v6_port_info;
 
         ioc_base = ecardm_iomap(ec, ECARD_RES_IOCFAST, 0, 0);
@@ -507,7 +507,7 @@ icside_register_v6(struct icside_state *state, struct expansion_card *ec)
         icside_setup_ports(&hw[0], easi_base, &icside_cardinfo_v6_1, ec);
         icside_setup_ports(&hw[1], easi_base, &icside_cardinfo_v6_2, ec);
 
-        host = ide_host_alloc(&d, hws);
+        host = ide_host_alloc(&d, hws, 2);
         if (host == NULL)
                 return -ENODEV;
 
diff --git a/drivers/ide/ide-4drives.c b/drivers/ide/ide-4drives.c
index 617ca7a5ec8a..189b8bd9957e 100644
--- a/drivers/ide/ide-4drives.c
+++ b/drivers/ide/ide-4drives.c
@@ -31,7 +31,7 @@ static const struct ide_port_info ide_4drives_port_info = {
 static int __init ide_4drives_init(void)
 {
         unsigned long base = 0x1f0, ctl = 0x3f6;
-        hw_regs_t hw, *hws[] = { &hw, &hw, NULL, NULL };
+        hw_regs_t hw, *hws[] = { &hw, &hw };
 
         if (probe_4drives == 0)
                 return -ENODEV;
@@ -54,7 +54,7 @@ static int __init ide_4drives_init(void)
         ide_std_init_ports(&hw, base, ctl);
         hw.irq = 14;
 
-        return ide_host_add(&ide_4drives_port_info, hws, NULL);
+        return ide_host_add(&ide_4drives_port_info, hws, 2, NULL);
 }
 
 module_init(ide_4drives_init);
diff --git a/drivers/ide/ide-cs.c b/drivers/ide/ide-cs.c
index 43d09dcae28c..63309ad04cb2 100644
--- a/drivers/ide/ide-cs.c
+++ b/drivers/ide/ide-cs.c
@@ -164,7 +164,7 @@ static struct ide_host *idecs_register(unsigned long io, unsigned long ctl,
     struct ide_host *host;
     ide_hwif_t *hwif;
     int i, rc;
-    hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };
+    hw_regs_t hw, *hws[] = { &hw };
 
     if (!request_region(io, 8, DRV_NAME)) {
         printk(KERN_ERR "%s: I/O resource 0x%lX-0x%lX not free.\n",
@@ -184,7 +184,7 @@ static struct ide_host *idecs_register(unsigned long io, unsigned long ctl,
     hw.irq = irq;
     hw.dev = &handle->dev;
 
-    rc = ide_host_add(&idecs_port_info, hws, &host);
+    rc = ide_host_add(&idecs_port_info, hws, 1, &host);
     if (rc)
         goto out_release;
 
diff --git a/drivers/ide/ide-generic.c b/drivers/ide/ide-generic.c
index 0427759d0187..0d40848540d4 100644
--- a/drivers/ide/ide-generic.c
+++ b/drivers/ide/ide-generic.c
@@ -86,7 +86,7 @@ static void ide_generic_check_pci_legacy_iobases(int *primary, int *secondary)
 
 static int __init ide_generic_init(void)
 {
-        hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };
+        hw_regs_t hw, *hws[] = { &hw };
         unsigned long io_addr;
         int i, rc = 0, primary = 0, secondary = 0;
 
@@ -133,7 +133,7 @@ static int __init ide_generic_init(void)
 #else
                         hw.irq = legacy_irqs[i];
 #endif
-                        rc = ide_host_add(&ide_generic_port_info, hws, NULL);
+                        rc = ide_host_add(&ide_generic_port_info, hws, 1, NULL);
                         if (rc) {
                                 release_region(io_addr + 0x206, 1);
                                 release_region(io_addr, 8);
diff --git a/drivers/ide/ide-h8300.c b/drivers/ide/ide-h8300.c
index 40eff6c9759c..0b5fabe2806d 100644
--- a/drivers/ide/ide-h8300.c
+++ b/drivers/ide/ide-h8300.c
@@ -83,7 +83,7 @@ static const struct ide_port_info h8300_port_info = {
 
 static int __init h8300_ide_init(void)
 {
-        hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };
+        hw_regs_t hw, *hws[] = { &hw };
 
         printk(KERN_INFO DRV_NAME ": H8/300 generic IDE interface\n");
 
@@ -96,7 +96,7 @@ static int __init h8300_ide_init(void)
 
         hw_setup(&hw);
 
-        return ide_host_add(&h8300_port_info, hws, NULL);
+        return ide_host_add(&h8300_port_info, hws, 1, NULL);
 
 out_busy:
         printk(KERN_ERR "ide-h8300: IDE I/F resource already used.\n");
diff --git a/drivers/ide/ide-legacy.c b/drivers/ide/ide-legacy.c
index 0c5b29c56cbe..98389e539909 100644
--- a/drivers/ide/ide-legacy.c
+++ b/drivers/ide/ide-legacy.c
@@ -40,7 +40,7 @@ static void ide_legacy_init_one(hw_regs_t **hws, hw_regs_t *hw,
 
 int ide_legacy_device_add(const struct ide_port_info *d, unsigned long config)
 {
-        hw_regs_t hw[2], *hws[] = { NULL, NULL, NULL, NULL };
+        hw_regs_t hw[2], *hws[] = { NULL, NULL };
 
         memset(&hw, 0, sizeof(hw));
 
@@ -52,6 +52,6 @@ int ide_legacy_device_add(const struct ide_port_info *d, unsigned long config)
             (d->host_flags & IDE_HFLAG_SINGLE))
                 return -ENOENT;
 
-        return ide_host_add(d, hws, NULL);
+        return ide_host_add(d, hws, 2, NULL);
 }
 EXPORT_SYMBOL_GPL(ide_legacy_device_add);
diff --git a/drivers/ide/ide-pnp.c b/drivers/ide/ide-pnp.c
index 47043fda2398..6bca0f05ee90 100644
--- a/drivers/ide/ide-pnp.c
+++ b/drivers/ide/ide-pnp.c
@@ -37,7 +37,7 @@ static int idepnp_probe(struct pnp_dev *dev, const struct pnp_device_id *dev_id)
         struct ide_host *host;
         unsigned long base, ctl;
         int rc;
-        hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };
+        hw_regs_t hw, *hws[] = { &hw };
 
         printk(KERN_INFO DRV_NAME ": generic PnP IDE interface\n");
 
@@ -64,7 +64,7 @@ static int idepnp_probe(struct pnp_dev *dev, const struct pnp_device_id *dev_id)
         ide_std_init_ports(&hw, base, ctl);
         hw.irq = pnp_irq(dev, 0);
 
-        rc = ide_host_add(&ide_pnp_port_info, hws, &host);
+        rc = ide_host_add(&ide_pnp_port_info, hws, 1, &host);
         if (rc)
                 goto out;
 
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
index f17ba1932ad6..6c7451a6e609 100644
--- a/drivers/ide/ide-probe.c
+++ b/drivers/ide/ide-probe.c
@@ -1261,7 +1261,8 @@ out_nomem:
         return -ENOMEM;
 }
 
-struct ide_host *ide_host_alloc(const struct ide_port_info *d, hw_regs_t **hws)
+struct ide_host *ide_host_alloc(const struct ide_port_info *d, hw_regs_t **hws,
+                                unsigned int n_ports)
 {
         struct ide_host *host;
         struct device *dev = hws[0] ? hws[0]->dev : NULL;
@@ -1272,7 +1273,7 @@ struct ide_host *ide_host_alloc(const struct ide_port_info *d, hw_regs_t **hws)
         if (host == NULL)
                 return NULL;
 
-        for (i = 0; i < MAX_HOST_PORTS; i++) {
+        for (i = 0; i < n_ports; i++) {
                 ide_hwif_t *hwif;
                 int idx;
 
@@ -1443,12 +1444,12 @@ int ide_host_register(struct ide_host *host, const struct ide_port_info *d,
 EXPORT_SYMBOL_GPL(ide_host_register);
 
 int ide_host_add(const struct ide_port_info *d, hw_regs_t **hws,
-                 struct ide_host **hostp)
+                 unsigned int n_ports, struct ide_host **hostp)
 {
         struct ide_host *host;
         int rc;
 
-        host = ide_host_alloc(d, hws);
+        host = ide_host_alloc(d, hws, n_ports);
         if (host == NULL)
                 return -ENOMEM;
 
diff --git a/drivers/ide/ide_platform.c b/drivers/ide/ide_platform.c
index 813653362a26..47413c2b5f8e 100644
--- a/drivers/ide/ide_platform.c
+++ b/drivers/ide/ide_platform.c
@@ -54,7 +54,7 @@ static int __devinit plat_ide_probe(struct platform_device *pdev)
         struct pata_platform_info *pdata;
         struct ide_host *host;
         int ret = 0, mmio = 0;
-        hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };
+        hw_regs_t hw, *hws[] = { &hw };
         struct ide_port_info d = platform_ide_port_info;
 
         pdata = pdev->dev.platform_data;
@@ -98,7 +98,7 @@ static int __devinit plat_ide_probe(struct platform_device *pdev)
         if (mmio)
                 d.host_flags |= IDE_HFLAG_MMIO;
 
-        ret = ide_host_add(&d, hws, &host);
+        ret = ide_host_add(&d, hws, 1, &host);
         if (ret)
                 goto out;
 
diff --git a/drivers/ide/macide.c b/drivers/ide/macide.c
index 3af9e96da617..31aa27818604 100644
--- a/drivers/ide/macide.c
+++ b/drivers/ide/macide.c
@@ -96,7 +96,7 @@ static int __init macide_init(void)
         ide_ack_intr_t *ack_intr;
         unsigned long base;
         int irq;
-        hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };
+        hw_regs_t hw, *hws[] = { &hw };
 
         if (!MACH_IS_MAC)
                 return -ENODEV;
@@ -126,7 +126,7 @@ static int __init macide_init(void)
 
         macide_setup_ports(&hw, base, irq, ack_intr);
 
-        return ide_host_add(&macide_port_info, hws, NULL);
+        return ide_host_add(&macide_port_info, hws, 1, NULL);
 }
 
 module_init(macide_init);
diff --git a/drivers/ide/palm_bk3710.c b/drivers/ide/palm_bk3710.c
index a455c25f43cc..4507a6d801bc 100644
--- a/drivers/ide/palm_bk3710.c
+++ b/drivers/ide/palm_bk3710.c
@@ -316,7 +316,7 @@ static int __init palm_bk3710_probe(struct platform_device *pdev)
         void __iomem *base;
         unsigned long rate, mem_size;
         int i, rc;
-        hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };
+        hw_regs_t hw, *hws[] = { &hw };
 
         clk = clk_get(&pdev->dev, "IDECLK");
         if (IS_ERR(clk))
@@ -369,7 +369,7 @@ static int __init palm_bk3710_probe(struct platform_device *pdev)
                                                              ATA_UDMA5;
 
         /* Register the IDE interface with Linux */
-        rc = ide_host_add(&palm_bk3710_port_info, hws, NULL);
+        rc = ide_host_add(&palm_bk3710_port_info, hws, 1, NULL);
         if (rc)
                 goto out;
 
diff --git a/drivers/ide/pmac.c b/drivers/ide/pmac.c
index f76e4e6b408f..f4f806476e0a 100644
--- a/drivers/ide/pmac.c
+++ b/drivers/ide/pmac.c
@@ -1029,7 +1029,7 @@ static int __devinit pmac_ide_setup_device(pmac_ide_hwif_t *pmif, hw_regs_t *hw)
         const int *bidp;
         struct ide_host *host;
         ide_hwif_t *hwif;
-        hw_regs_t *hws[] = { hw, NULL, NULL, NULL };
+        hw_regs_t *hws[] = { hw };
         struct ide_port_info d = pmac_port_info;
         int rc;
 
@@ -1077,7 +1077,7 @@ static int __devinit pmac_ide_setup_device(pmac_ide_hwif_t *pmif, hw_regs_t *hw)
         /* Make sure we have sane timings */
         sanitize_timings(pmif);
 
-        host = ide_host_alloc(&d, hws);
+        host = ide_host_alloc(&d, hws, 1);
         if (host == NULL)
                 return -ENOMEM;
         hwif = host->ports[0];
diff --git a/drivers/ide/q40ide.c b/drivers/ide/q40ide.c
index 7488d4ff3d7c..e46229fe5ea3 100644
--- a/drivers/ide/q40ide.c
+++ b/drivers/ide/q40ide.c
@@ -135,7 +135,7 @@ static const char *q40_ide_names[Q40IDE_NUM_HWIFS]={
 static int __init q40ide_init(void)
 {
     int i;
-    hw_regs_t hw[Q40IDE_NUM_HWIFS], *hws[] = { NULL, NULL, NULL, NULL };
+    hw_regs_t hw[Q40IDE_NUM_HWIFS], *hws[] = { NULL, NULL };
 
     if (!MACH_IS_Q40)
       return -ENODEV;
@@ -162,7 +162,7 @@ static int __init q40ide_init(void)
         hws[i] = &hw[i];
     }
 
-    return ide_host_add(&q40ide_port_info, hws, NULL);
+    return ide_host_add(&q40ide_port_info, hws, Q40IDE_NUM_HWIFS, NULL);
 }
 
 module_init(q40ide_init);
diff --git a/drivers/ide/rapide.c b/drivers/ide/rapide.c
index bd4d7a8a666c..c4da3dd39f5c 100644
--- a/drivers/ide/rapide.c
+++ b/drivers/ide/rapide.c
@@ -36,7 +36,7 @@ rapide_probe(struct expansion_card *ec, const struct ecard_id *id)
         void __iomem *base;
         struct ide_host *host;
         int ret;
-        hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };
+        hw_regs_t hw, *hws[] = { &hw };
 
         ret = ecard_request_resources(ec);
         if (ret)
@@ -52,7 +52,7 @@ rapide_probe(struct expansion_card *ec, const struct ecard_id *id)
         rapide_setup_ports(&hw, base, base + 0x818, 1 << 6, ec->irq);
         hw.dev = &ec->dev;
 
-        ret = ide_host_add(&rapide_port_info, hws, &host);
+        ret = ide_host_add(&rapide_port_info, hws, 1, &host);
         if (ret)
                 goto release;
 
diff --git a/drivers/ide/scc_pata.c b/drivers/ide/scc_pata.c
index 9e3aef317332..9415f8c8a41d 100644
--- a/drivers/ide/scc_pata.c
+++ b/drivers/ide/scc_pata.c
@@ -559,7 +559,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 };
+        hw_regs_t hw, *hws[] = { &hw };
         int i, rc;
 
         memset(&hw, 0, sizeof(hw));
@@ -568,7 +568,7 @@ static int scc_ide_setup_pci_device(struct pci_dev *dev,
         hw.irq = dev->irq;
         hw.dev = &dev->dev;
 
-        rc = ide_host_add(d, hws, &host);
+        rc = ide_host_add(d, hws, 1, &host);
         if (rc)
                 return rc;
 
diff --git a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c
index 82519ddc9108..d78f4c994517 100644
--- a/drivers/ide/setup-pci.c
+++ b/drivers/ide/setup-pci.c
@@ -538,7 +538,7 @@ int ide_pci_init_one(struct pci_dev *dev, const struct ide_port_info *d,
                      void *priv)
 {
         struct ide_host *host;
-        hw_regs_t hw[4], *hws[] = { NULL, NULL, NULL, NULL };
+        hw_regs_t hw[2], *hws[] = { NULL, NULL };
         int ret;
 
         ret = ide_setup_pci_controller(dev, d, 1);
@@ -547,7 +547,7 @@ int ide_pci_init_one(struct pci_dev *dev, const struct ide_port_info *d,
 
         ide_pci_setup_ports(dev, d, &hw[0], &hws[0]);
 
-        host = ide_host_alloc(d, hws);
+        host = ide_host_alloc(d, hws, 2);
         if (host == NULL) {
                 ret = -ENOMEM;
                 goto out;
@@ -596,7 +596,7 @@ int ide_pci_init_two(struct pci_dev *dev1, struct pci_dev *dev2,
                 ide_pci_setup_ports(pdev[i], d, &hw[i*2], &hws[i*2]);
         }
 
-        host = ide_host_alloc(d, hws);
+        host = ide_host_alloc(d, hws, 4);
         if (host == NULL) {
                 ret = -ENOMEM;
                 goto out;
diff --git a/drivers/ide/sgiioc4.c b/drivers/ide/sgiioc4.c
index 676d41c7add5..3f8ee357ffb3 100644
--- a/drivers/ide/sgiioc4.c
+++ b/drivers/ide/sgiioc4.c
@@ -546,7 +546,7 @@ sgiioc4_ide_setup_pci_device(struct pci_dev *dev)
         unsigned long cmd_base, irqport;
         unsigned long bar0, cmd_phys_base, ctl;
         void __iomem *virt_base;
-        hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };
+        hw_regs_t hw, *hws[] = { &hw };
         int rc;
 
         /*  Get the CmdBlk and CtrlBlk Base Registers */
@@ -580,7 +580,7 @@ sgiioc4_ide_setup_pci_device(struct pci_dev *dev)
         /* Initializing chipset IRQ Registers */
         writel(0x03, (void __iomem *)(irqport + IOC4_INTR_SET * 4));
 
-        rc = ide_host_add(&sgiioc4_port_info, hws, NULL);
+        rc = ide_host_add(&sgiioc4_port_info, hws, 1, NULL);
         if (!rc)
                 return 0;
 
diff --git a/drivers/ide/tx4938ide.c b/drivers/ide/tx4938ide.c
index e33d764e2945..16adc18499fa 100644
--- a/drivers/ide/tx4938ide.c
+++ b/drivers/ide/tx4938ide.c
@@ -130,8 +130,7 @@ static const struct ide_port_info tx4938ide_port_info __initdata = {
 
 static int __init tx4938ide_probe(struct platform_device *pdev)
 {
-        hw_regs_t hw;
-        hw_regs_t *hws[] = { &hw, NULL, NULL, NULL };
+        hw_regs_t hw, *hws[] = { &hw };
         struct ide_host *host;
         struct resource *res;
         struct tx4938ide_platform_info *pdata = pdev->dev.platform_data;
@@ -183,7 +182,7 @@ static int __init tx4938ide_probe(struct platform_device *pdev)
                 tx4938ide_tune_ebusc(pdata->ebus_ch, pdata->gbus_clock, 0);
         else
                 d.port_ops = NULL;
-        ret = ide_host_add(&d, hws, &host);
+        ret = ide_host_add(&d, hws, 1, &host);
         if (!ret)
                 platform_set_drvdata(pdev, host);
         return ret;
diff --git a/drivers/ide/tx4939ide.c b/drivers/ide/tx4939ide.c
index 564422d23976..fa57920d003a 100644
--- a/drivers/ide/tx4939ide.c
+++ b/drivers/ide/tx4939ide.c
@@ -537,8 +537,7 @@ static const struct ide_port_info tx4939ide_port_info __initdata = {
 
 static int __init tx4939ide_probe(struct platform_device *pdev)
 {
-        hw_regs_t hw;
-        hw_regs_t *hws[] = { &hw, NULL, NULL, NULL };
+        hw_regs_t hw, *hws[] = { &hw };
         struct ide_host *host;
         struct resource *res;
         int irq, ret;
@@ -581,7 +580,7 @@ static int __init tx4939ide_probe(struct platform_device *pdev)
         hw.dev = &pdev->dev;
 
         pr_info("TX4939 IDE interface (base %#lx, irq %d)\n", mapbase, irq);
-        host = ide_host_alloc(&tx4939ide_port_info, hws);
+        host = ide_host_alloc(&tx4939ide_port_info, hws, 1);
         if (!host)
                 return -ENOMEM;
         /* use extra_base for base address of the all registers */