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
...@@ -1056,6 +1056,9 @@ endif ...@@ -1056,6 +1056,9 @@ endif
config BLK_DEV_IDEDMA config BLK_DEV_IDEDMA
def_bool BLK_DEV_IDEDMA_PCI || BLK_DEV_IDEDMA_PMAC || BLK_DEV_IDEDMA_ICS || BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA 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 endif
config BLK_DEV_HD_ONLY config BLK_DEV_HD_ONLY
......
...@@ -388,7 +388,7 @@ static ide_hwif_t *ide_hwif_configure(struct pci_dev *dev, ide_pci_device_t *d, ...@@ -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 || if (hwif->io_ports[IDE_DATA_OFFSET] != base ||
hwif->io_ports[IDE_CONTROL_OFFSET] != (ctl | 2)) { hwif->io_ports[IDE_CONTROL_OFFSET] != (ctl | 2)) {
memset(&hwif->hw, 0, sizeof(hwif->hw)); 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)); ide_std_init_ports(&hwif->hw, base, (ctl | 2));
hwif->hw.io_ports[IDE_IRQ_OFFSET] = 0; hwif->hw.io_ports[IDE_IRQ_OFFSET] = 0;
#else #else
......
...@@ -40,7 +40,6 @@ static inline unsigned long ide_default_io_base(int index) ...@@ -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 */ #define ide_default_io_ctl(base) ((base) + 0x206) /* obsolete */
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
......
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
#endif #endif
#if !defined(CONFIG_ARCH_L7200) #if !defined(CONFIG_ARCH_L7200)
# define IDE_ARCH_OBSOLETE_INIT
# ifdef CONFIG_ARCH_CLPS7500 # ifdef CONFIG_ARCH_CLPS7500
# define ide_default_io_ctl(base) ((base) + 0x206) /* obsolete */ # define ide_default_io_ctl(base) ((base) + 0x206) /* obsolete */
# else # else
......
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#define MAX_HWIFS 1 #define MAX_HWIFS 1
/* Legacy ... BLK_DEV_IDECS */ /* Legacy ... BLK_DEV_IDECS */
#define IDE_ARCH_OBSOLETE_INIT
#define ide_default_io_ctl(base) ((base) + 0x206) /* obsolete */ #define ide_default_io_ctl(base) ((base) + 0x206) /* obsolete */
......
...@@ -46,7 +46,6 @@ static inline unsigned long ide_default_io_base(int index) ...@@ -46,7 +46,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 */ #define ide_default_io_ctl(base) ((base) + 0x206) /* obsolete */
#ifdef CONFIG_PCI #ifdef CONFIG_PCI
......
...@@ -65,7 +65,6 @@ static __inline__ unsigned long ide_default_io_base(int index) ...@@ -65,7 +65,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 */ #define ide_default_io_ctl(base) ((base) + 0x206) /* obsolete */
#ifdef CONFIG_BLK_DEV_IDEPCI #ifdef CONFIG_BLK_DEV_IDEPCI
......
...@@ -98,7 +98,6 @@ static __inline__ unsigned long ide_default_io_base(int index) ...@@ -98,7 +98,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 */ #define ide_default_io_ctl(base) ((base) + 0x206) /* obsolete */
#ifdef CONFIG_BLK_DEV_IDEPCI #ifdef CONFIG_BLK_DEV_IDEPCI
......
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
#define MAX_HWIFS 2 #define MAX_HWIFS 2
#endif #endif
#define IDE_ARCH_OBSOLETE_INIT
#define ide_default_io_ctl(base) ((base) + 0x206) /* obsolete */ #define ide_default_io_ctl(base) ((base) + 0x206) /* obsolete */
#define ide_request_irq(irq,hand,flg,dev,id) request_irq((irq),(hand),(flg),(dev),(id)) #define ide_request_irq(irq,hand,flg,dev,id) request_irq((irq),(hand),(flg),(dev),(id))
......
...@@ -74,7 +74,6 @@ static __inline__ unsigned long ide_default_io_base(int index) ...@@ -74,7 +74,6 @@ static __inline__ unsigned long ide_default_io_base(int index)
#endif /* __powerpc64__ */ #endif /* __powerpc64__ */
#define IDE_ARCH_OBSOLETE_INIT
#define ide_default_io_ctl(base) ((base) + 0x206) /* obsolete */ #define ide_default_io_ctl(base) ((base) + 0x206) /* obsolete */
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
......
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
/* Without this, the initialisation of PCI IDE cards end up calling /* Without this, the initialisation of PCI IDE cards end up calling
* ide_init_hwif_ports, which won't work. */ * ide_init_hwif_ports, which won't work. */
#ifdef CONFIG_BLK_DEV_IDEPCI #ifdef CONFIG_BLK_DEV_IDEPCI
#define IDE_ARCH_OBSOLETE_INIT 1
#define ide_default_io_ctl(base) (0) #define ide_default_io_ctl(base) (0)
#endif #endif
......
...@@ -18,7 +18,6 @@ ...@@ -18,7 +18,6 @@
#undef MAX_HWIFS #undef MAX_HWIFS
#define MAX_HWIFS 2 #define MAX_HWIFS 2
#define IDE_ARCH_OBSOLETE_INIT
#define ide_default_io_ctl(base) ((base) + 0x206) /* obsolete */ #define ide_default_io_ctl(base) ((base) + 0x206) /* obsolete */
#define __ide_insl(data_reg, buffer, wcount) \ #define __ide_insl(data_reg, buffer, wcount) \
......
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
# endif # endif
#endif #endif
#define IDE_ARCH_OBSOLETE_INIT
#define ide_default_io_ctl(base) ((base) + 0x206) /* obsolete */ #define ide_default_io_ctl(base) ((base) + 0x206) /* obsolete */
#define __ide_insl(data_reg, buffer, wcount) \ #define __ide_insl(data_reg, buffer, wcount) \
......
...@@ -62,7 +62,6 @@ static __inline__ unsigned long ide_default_io_base(int index) ...@@ -62,7 +62,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 */ #define ide_default_io_ctl(base) ((base) + 0x206) /* obsolete */
#ifdef CONFIG_BLK_DEV_IDEPCI #ifdef CONFIG_BLK_DEV_IDEPCI
......
...@@ -265,11 +265,7 @@ static inline void ide_std_init_ports(hw_regs_t *hw, ...@@ -265,11 +265,7 @@ static inline void ide_std_init_ports(hw_regs_t *hw,
# define ide_init_default_irq(base) (0) # define ide_init_default_irq(base) (0)
#endif #endif
/* #ifdef CONFIG_IDE_ARCH_OBSOLETE_INIT
* ide_init_hwif_ports() is OBSOLETE and will be removed in 2.7 series.
* New ports shouldn't define IDE_ARCH_OBSOLETE_INIT in <asm/ide.h>.
*/
#ifdef IDE_ARCH_OBSOLETE_INIT
static inline void ide_init_hwif_ports(hw_regs_t *hw, static inline void ide_init_hwif_ports(hw_regs_t *hw,
unsigned long io_addr, unsigned long io_addr,
unsigned long ctl_addr, unsigned long ctl_addr,
...@@ -299,7 +295,7 @@ static inline void ide_init_hwif_ports(hw_regs_t *hw, ...@@ -299,7 +295,7 @@ static inline void ide_init_hwif_ports(hw_regs_t *hw,
if (io_addr || ctl_addr) if (io_addr || ctl_addr)
printk(KERN_WARNING "%s: must not be called\n", __FUNCTION__); printk(KERN_WARNING "%s: must not be called\n", __FUNCTION__);
} }
#endif /* IDE_ARCH_OBSOLETE_INIT */ #endif /* CONFIG_IDE_ARCH_OBSOLETE_INIT */
/* Currently only m68k, apus and m8xx need it */ /* Currently only m68k, apus and m8xx need it */
#ifndef IDE_ARCH_ACK_INTR #ifndef IDE_ARCH_ACK_INTR
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment