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>

1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/ide/legacy/ide-4drives.c b/drivers/ide/legacy/ide-4drives.c
index 89c8ff0a4d08..6310dc50e3c5 100644
--- a/drivers/ide/legacy/ide-4drives.c
+++ b/drivers/ide/legacy/ide-4drives.c
@@ -30,8 +30,8 @@ static int __init ide_4drives_init(void)
 {
         ide_hwif_t *hwif, *mate;
         unsigned long base = 0x1f0, ctl = 0x3f6;
+        hw_regs_t hw, *hws[] = { NULL, NULL, NULL, NULL };
         u8 idx[4] = { 0xff, 0xff, 0xff, 0xff };
-        hw_regs_t hw;
 
         if (probe_4drives == 0)
                 return -ENODEV;
@@ -57,17 +57,19 @@ static int __init ide_4drives_init(void)
 
         hwif = ide_find_port();
         if (hwif) {
-                ide_init_port_hw(hwif, &hw);
+                hwif->chipset = ide_4drives;
+
+                hws[0] = &hw;
                 idx[0] = hwif->index;
         }
 
         mate = ide_find_port();
         if (mate) {
-                ide_init_port_hw(mate, &hw);
+                hws[1] = &hw;
                 idx[1] = mate->index;
         }
 
-        ide_device_add(idx, &ide_4drives_port_info);
+        ide_device_add(idx, &ide_4drives_port_info, hws);
 
         return 0;
 }