Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 847ddd2b authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: add CONFIG_IDE_ARCH_OBSOLETE_INIT 



Add CONFIG_IDE_ARCH_OBSOLETE_INIT to drivers/ide/Kconfig and use it instead
of defining IDE_ARCH_OBSOLETE_INIT in <arch/ide.h>.

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent f9b93097

drivers/ide/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -1056,6 +1056,9 @@ endif 
config BLK_DEV_IDEDMA

	def_bool BLK_DEV_IDEDMA_PCI || 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



endif



config BLK_DEV_HD_ONLY

drivers/ide/setup-pci.c

+1 −1
Original line number Diff line number Diff line
@@ -388,7 +388,7 @@ static ide_hwif_t *ide_hwif_configure(struct pci_dev *dev, ide_pci_device_t *d, 
	if (hwif->io_ports[IDE_DATA_OFFSET] != base ||

	    hwif->io_ports[IDE_CONTROL_OFFSET] != (ctl | 2)) {

		memset(&hwif->hw, 0, sizeof(hwif->hw));

#ifndef IDE_ARCH_OBSOLETE_INIT

#ifndef CONFIG_IDE_ARCH_OBSOLETE_INIT

		ide_std_init_ports(&hwif->hw, base, (ctl | 2));

		hwif->hw.io_ports[IDE_IRQ_OFFSET] = 0;

#else

include/asm-alpha/ide.h

+0 −1
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ static inline unsigned long ide_default_io_base(int index) 
	}

}



#define IDE_ARCH_OBSOLETE_INIT

#define ide_default_io_ctl(base)	((base) + 0x206) /* obsolete */



#ifdef CONFIG_PCI

include/asm-arm/ide.h

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
#endif



#if !defined(CONFIG_ARCH_L7200)

# define IDE_ARCH_OBSOLETE_INIT

# ifdef CONFIG_ARCH_CLPS7500

#  define ide_default_io_ctl(base)	((base) + 0x206) /* obsolete */

# else

include/asm-blackfin/ide.h

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
#define MAX_HWIFS	1



/* Legacy ... BLK_DEV_IDECS */

#define IDE_ARCH_OBSOLETE_INIT

#define ide_default_io_ctl(base)	((base) + 0x206) /* obsolete */