Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=944000921d41c5aacfda6515ad3a0bbde52f8fa3
Commit:     944000921d41c5aacfda6515ad3a0bbde52f8fa3
Parent:     cbb010c180294a5242a7681555c28737d9dd26ab
Author:     Bartlomiej Zolnierkiewicz <[EMAIL PROTECTED]>
AuthorDate: Sat Jan 26 20:13:06 2008 +0100
Committer:  Bartlomiej Zolnierkiewicz <[EMAIL PROTECTED]>
CommitDate: Sat Jan 26 20:13:06 2008 +0100

    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 <[EMAIL PROTECTED]>
---
 drivers/ide/arm/ide_arm.c |    1 -
 drivers/ide/ide.c         |    6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/drivers/ide/arm/ide_arm.c b/drivers/ide/arm/ide_arm.c
index 1a03a2a..21ba6ac 100644
--- 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 3ec220b..77af743 100644
--- 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();
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to