ide: move ide_arm_init() call from init_ide_data() to ide_init()

* Remove ide_init_port_data() call from ide_arm_init() and move
  ide_arm_init() call from init_ide_data() to ide_init().

This patch is a preparation for the future changes (and as a side-effect
makes obsolete "idex=io[,ctl[,irq]]" kernel parameters work for ide_arm).

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

diff --git a/drivers/ide/arm/ide_arm.c b/drivers/ide/arm/ide_arm.c
index 1a03a2a285efef7081f7778056db77b15039333f..21ba6ac2f826ea32fdd14e9921dda64c4b6aa47b 100644 (file)
--- a/drivers/ide/arm/ide_arm.c
+++ b/drivers/ide/arm/ide_arm.c
@@ -35,7 +35,6 @@ void __init ide_arm_init(void)
 
        hwif = ide_find_port(hw.io_ports[IDE_DATA_OFFSET]);
        if (hwif) {
-               ide_init_port_data(hwif, hwif->index);
                ide_init_port_hw(hwif, &hw);
        }
 }

diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 3ec220b64d0be01c83f1ffd577831976600123df..77af743425e813cd695dd17f92a209ee5bc5c162 100644 (file)
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -218,9 +218,6 @@ static void __init init_ide_data (void)
                        ide_init_default_irq(hwif->io_ports[IDE_DATA_OFFSET]);
 #endif
        }
-#ifdef CONFIG_IDE_ARM
-       ide_arm_init();
-#endif
 }
 
 /**
@@ -1774,6 +1771,9 @@ static int __init ide_init(void)
 
        proc_ide_create();
 
+#ifdef CONFIG_IDE_ARM
+       ide_arm_init();
+#endif
 #ifdef CONFIG_BLK_DEV_ALI14XX
        if (probe_ali14xx)
                (void)ali14xx_init();