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>

4 files changed, 12 insertions, 17 deletions

diff --git a/drivers/ide/arm/icside.c b/drivers/ide/arm/icside.c
index 52f58c885783..850fe9342a1f 100644
--- a/drivers/ide/arm/icside.c
+++ b/drivers/ide/arm/icside.c
@@ -442,8 +442,8 @@ icside_register_v5(struct icside_state *state, struct expansion_card *ec)
 {
         ide_hwif_t *hwif;
         void __iomem *base;
+        hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };
         u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
-        hw_regs_t hw;
 
         base = ecardm_iomap(ec, ECARD_RES_MEMC, 0, 0);
         if (!base)
@@ -467,7 +467,6 @@ icside_register_v5(struct icside_state *state, struct expansion_card *ec)
         if (!hwif)
                 return -ENODEV;
 
-        ide_init_port_hw(hwif, &hw);
         default_hwif_mmiops(hwif);
 
         state->hwif[0] = hwif;
@@ -476,7 +475,7 @@ icside_register_v5(struct icside_state *state, struct expansion_card *ec)
 
         idx[0] = hwif->index;
 
-        ide_device_add(idx, NULL);
+        ide_device_add(idx, NULL, hws);
 
         return 0;
 }
@@ -497,9 +496,9 @@ icside_register_v6(struct icside_state *state, struct expansion_card *ec)
         void __iomem *ioc_base, *easi_base;
         unsigned int sel = 0;
         int ret;
+        hw_regs_t hw[2], *hws[] = { &hw[0], NULL, NULL, NULL };
         u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
         struct ide_port_info d = icside_v6_port_info;
-        hw_regs_t hw[2];
 
         ioc_base = ecardm_iomap(ec, ECARD_RES_IOCFAST, 0, 0);
         if (!ioc_base) {
@@ -545,16 +544,16 @@ icside_register_v6(struct icside_state *state, struct expansion_card *ec)
         if (hwif == NULL)
                 return -ENODEV;
 
-        ide_init_port_hw(hwif, &hw[0]);
+        hwif->chipset = ide_acorn;
         default_hwif_mmiops(hwif);
 
         idx[0] = hwif->index;
 
         mate = ide_find_port();
         if (mate) {
-                ide_init_port_hw(mate, &hw[1]);
                 default_hwif_mmiops(mate);
 
+                hws[1] = &hw[1];
                 idx[1] = mate->index;
         }
 
@@ -569,7 +568,7 @@ icside_register_v6(struct icside_state *state, struct expansion_card *ec)
                 d.dma_ops = NULL;
         }
 
-        ide_device_add(idx, &d);
+        ide_device_add(idx, &d, hws);
 
         return 0;
 
diff --git a/drivers/ide/arm/ide_arm.c b/drivers/ide/arm/ide_arm.c
index 2f311da4c963..e9831bbd988a 100644
--- a/drivers/ide/arm/ide_arm.c
+++ b/drivers/ide/arm/ide_arm.c
@@ -29,8 +29,8 @@
 static int __init ide_arm_init(void)
 {
         ide_hwif_t *hwif;
-        hw_regs_t hw;
         unsigned long base = IDE_ARM_IO, ctl = IDE_ARM_IO + 0x206;
+        hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };
         u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
 
         if (!request_region(base, 8, DRV_NAME)) {
@@ -53,10 +53,9 @@ static int __init ide_arm_init(void)
 
         hwif = ide_find_port();
         if (hwif) {
-                ide_init_port_hw(hwif, &hw);
                 idx[0] = hwif->index;
 
-                ide_device_add(idx, NULL);
+                ide_device_add(idx, NULL, hws);
         }
 
         return 0;
diff --git a/drivers/ide/arm/palm_bk3710.c b/drivers/ide/arm/palm_bk3710.c
index c79b85b6e4a3..023c10753f15 100644
--- a/drivers/ide/arm/palm_bk3710.c
+++ b/drivers/ide/arm/palm_bk3710.c
@@ -351,7 +351,7 @@ static int __devinit palm_bk3710_probe(struct platform_device *pdev)
         ide_hwif_t *hwif;
         unsigned long base, rate;
         int i;
-        hw_regs_t hw;
+        hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };
         u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
 
         clk = clk_get(NULL, "IDECLK");
@@ -400,13 +400,11 @@ static int __devinit palm_bk3710_probe(struct platform_device *pdev)
 
         i = hwif->index;
 
-        ide_init_port_hw(hwif, &hw);
-
         default_hwif_mmiops(hwif);
 
         idx[0] = i;
 
-        ide_device_add(idx, &palm_bk3710_port_info);
+        ide_device_add(idx, &palm_bk3710_port_info, hws);
 
         return 0;
 out:
diff --git a/drivers/ide/arm/rapide.c b/drivers/ide/arm/rapide.c
index 43057e0303c8..01896f6e8acf 100644
--- a/drivers/ide/arm/rapide.c
+++ b/drivers/ide/arm/rapide.c
@@ -35,8 +35,8 @@ rapide_probe(struct expansion_card *ec, const struct ecard_id *id)
         ide_hwif_t *hwif;
         void __iomem *base;
         int ret;
+        hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };
         u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
-        hw_regs_t hw;
 
         ret = ecard_request_resources(ec);
         if (ret)
@@ -59,12 +59,11 @@ rapide_probe(struct expansion_card *ec, const struct ecard_id *id)
                 goto release;
         }
 
-        ide_init_port_hw(hwif, &hw);
         default_hwif_mmiops(hwif);
 
         idx[0] = hwif->index;
 
-        ide_device_add(idx, &rapide_port_info);
+        ide_device_add(idx, &rapide_port_info, hws);
 
         ecard_set_drvdata(ec, hwif);
         goto out;