ide: drop 'initializing' argument from ide_register_hw()

* Rename init_hwif_data() to ide_init_port_data() and export it.

* For all users of ide_register_hw() with 'initializing' argument set
  hwif->present and hwif->hold are always zero so convert these host
  drivers to use ide_find_port()+ide_init_port_data()+ide_init_port_hw()
  instead (also no need for init_hwif_default() call since the setup
  done by it gets over-ridden by ide_init_port_hw() call).

* Drop 'initializing' argument from ide_register_hw().

Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Roman Zippel <zippel@linux-m68k.org>
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

1 files changed, 7 insertions, 3 deletions

diff --git a/drivers/ide/legacy/gayle.c b/drivers/ide/legacy/gayle.c
index 53331ee1e957..705d0b8a3f5d 100644
--- a/drivers/ide/legacy/gayle.c
+++ b/drivers/ide/legacy/gayle.c
@@ -133,7 +133,6 @@ found:
         ide_ack_intr_t *ack_intr;
         hw_regs_t hw;
         ide_hwif_t *hwif;
-        int index;
         unsigned long phys_base, res_start, res_n;
 
         if (a4000) {
@@ -165,8 +164,13 @@ found:
 //                      &gayle_iops,
                         IRQ_AMIGA_PORTS);
 
-        index = ide_register_hw(&hw, NULL, 1, &hwif);
-        if (index != -1) {
+        hwif = ide_find_port(base);
+        if (hwif) {
+            u8 index = hwif->index;
+
+            ide_init_port_data(hwif, index);
+            ide_init_port_hw(hwif, &hw);
+
             hwif->mmio = 1;
             switch (i) {
                 case 0: