ide: pass hw_regs_t-s to ide_device_add[_all]() (take 3)

* Add 'hw_regs_t **hws' argument to ide_device_add[_all]() and convert
  host drivers + ide_legacy_init_one() + ide_setup_pci_device[s]() to use
  it instead of calling ide_init_port_hw() directly.

  [ However if host has > 1 port we must still set hwif->chipset to hint
    consecutive ide_find_port() call that the previous slot is occupied. ]

* Unexport ide_init_port_hw().

v2:
* Use defines instead of hard-coded values in buddha.c, gayle.c and q40ide.c.
  (Suggested by Geert Uytterhoeven)

* Better patch description.

v3:
* Fix build problem in ide-cs.c. (Noticed by Stephen Rothwell)

There should be no functional changes caused by this patch.

Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

2 files changed, 4 insertions, 8 deletions

diff --git a/drivers/ide/mips/au1xxx-ide.c b/drivers/ide/mips/au1xxx-ide.c
index 48d57cae63c6..475da582fd89 100644
--- a/drivers/ide/mips/au1xxx-ide.c
+++ b/drivers/ide/mips/au1xxx-ide.c
@@ -546,8 +546,8 @@ static int au_ide_probe(struct device *dev)
         ide_hwif_t *hwif;
         struct resource *res;
         int ret = 0;
+        hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };
         u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
-        hw_regs_t hw;
 
 #if defined(CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA)
         char *mode = "MWDMA2";
@@ -596,8 +596,6 @@ static int au_ide_probe(struct device *dev)
         hw.dev = dev;
         hw.chipset = ide_au1xxx;
 
-        ide_init_port_hw(hwif, &hw);
-
         /* If the user has selected DDMA assisted copies,
            then set up a few local I/O function entry points 
         */
@@ -611,7 +609,7 @@ static int au_ide_probe(struct device *dev)
 
         idx[0] = hwif->index;
 
-        ide_device_add(idx, &au1xxx_port_info);
+        ide_device_add(idx, &au1xxx_port_info, hws);
 
         dev_set_drvdata(dev, hwif);
 
diff --git a/drivers/ide/mips/swarm.c b/drivers/ide/mips/swarm.c
index 9f1212cc4aed..6da6844d2d8c 100644
--- a/drivers/ide/mips/swarm.c
+++ b/drivers/ide/mips/swarm.c
@@ -75,8 +75,8 @@ static int __devinit swarm_ide_probe(struct device *dev)
         ide_hwif_t *hwif;
         u8 __iomem *base;
         phys_t offset, size;
-        hw_regs_t hw;
         int i;
+        hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };
         u8 idx[] = { 0xff, 0xff, 0xff, 0xff };
 
         if (!SIBYTE_HAVE_IDE)
@@ -120,14 +120,12 @@ static int __devinit swarm_ide_probe(struct device *dev)
         if (hwif == NULL)
                 goto err;
 
-        ide_init_port_hw(hwif, &hw);
-
         /* Setup MMIO ops. */
         default_hwif_mmiops(hwif);
 
         idx[0] = hwif->index;
 
-        ide_device_add(idx, &swarm_port_info);
+        ide_device_add(idx, &swarm_port_info, hws);
 
         dev_set_drvdata(dev, hwif);