ide: remove CONFIG_IDE_ARCH_OBSOLETE_INIT

* Use CONFIG_IDE_ARCH_OBSOLETE_DEFAULTS instead of
  CONFIG_IDE_ARCH_OBSOLETE_INIT in init_ide_data().

* Remove no longer needed CONFIG_IDE_ARCH_OBSOLETE_INIT.

There should be no functional changes caused by this patch.

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

2 files changed, 2 insertions, 5 deletions

diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index a57893c03b7a..29dd99caaf50 100644
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -1089,9 +1089,6 @@ config BLK_DEV_IDEDMA
         def_bool BLK_DEV_IDEDMA_SFF || BLK_DEV_IDEDMA_PMAC || \
                  BLK_DEV_IDEDMA_ICS || BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA
 
-config IDE_ARCH_OBSOLETE_INIT
-        def_bool ALPHA || (ARM && !ARCH_L7200) || BLACKFIN || X86 || IA64 || M32R || MIPS || PARISC || PPC || (SUPERH64 && BLK_DEV_IDEPCI) || SPARC
-
 config IDE_ARCH_OBSOLETE_DEFAULTS
         def_bool ALPHA || X86 || IA64 || M32R || MIPS || PPC32
 
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index a1a02c74d77f..9b9b686fbacb 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -206,16 +206,16 @@ static void __init init_ide_data (void)
 
                 ide_init_port_data(hwif, index);
 
-#ifdef CONFIG_IDE_ARCH_OBSOLETE_INIT
+#ifdef CONFIG_IDE_ARCH_OBSOLETE_DEFAULTS
                 memset(&hw, 0, sizeof(hw));
                 ide_std_init_ports(&hw, io_addr, ctl_addr);
                 memcpy(hwif->io_ports, hw.io_ports, sizeof(hw.io_ports));
-#endif
                 hwif->noprobe = !hwif->io_ports[IDE_DATA_OFFSET];
 #if !defined(CONFIG_PPC32) || defined(CONFIG_PPLUS) || !defined(CONFIG_PCI)
                 hwif->irq =
                         ide_init_default_irq(hwif->io_ports[IDE_DATA_OFFSET]);
 #endif
+#endif
         }
 }