Commit 5c504270 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

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: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 0e33555f

drivers/ide/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -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

drivers/ide/ide.c

+2 −2
Original line number Diff line number Diff line
@@ -206,15 +206,15 @@ 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

	}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE