diff options
| author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-01-26 20:13:06 +0100 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2008-01-26 20:13:06 +0100 |
| commit | 944000921d41c5aacfda6515ad3a0bbde52f8fa3 (patch) | |
| tree | a2f814052f6a310fb9f36d80c2905c2838f0d275 | |
| parent | cbb010c180294a5242a7681555c28737d9dd26ab (diff) | |
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>
| -rw-r--r-- | drivers/ide/arm/ide_arm.c | 1 | ||||
| -rw-r--r-- | 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 1a03a2a285e..21ba6ac2f82 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 3ec220b64d0..77af743425e 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(); |