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>

1 files changed, 3 insertions, 3 deletions

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;