diff options
-rw-r--r-- | drivers/ide/Kconfig | 3 | ||||
-rw-r--r-- | drivers/ide/ide-probe.c | 4 | ||||
-rw-r--r-- | drivers/ide/ide.c | 4 | ||||
-rw-r--r-- | drivers/ide/pci/ns87415.c | 4 | ||||
-rw-r--r-- | include/asm-alpha/ide.h | 3 | ||||
-rw-r--r-- | include/asm-ia64/ide.h | 2 | ||||
-rw-r--r-- | include/asm-m32r/ide.h | 2 | ||||
-rw-r--r-- | include/asm-mips/mach-generic/ide.h | 2 | ||||
-rw-r--r-- | include/asm-powerpc/ide.h | 2 | ||||
-rw-r--r-- | include/asm-x86/ide.h | 2 | ||||
-rw-r--r-- | include/linux/ide.h | 7 |
11 files changed, 15 insertions, 20 deletions
diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig index 4dc2761e9704..a57893c03b7a 100644 --- a/drivers/ide/Kconfig +++ b/drivers/ide/Kconfig | |||
@@ -1092,6 +1092,9 @@ config BLK_DEV_IDEDMA | |||
1092 | config IDE_ARCH_OBSOLETE_INIT | 1092 | config IDE_ARCH_OBSOLETE_INIT |
1093 | def_bool ALPHA || (ARM && !ARCH_L7200) || BLACKFIN || X86 || IA64 || M32R || MIPS || PARISC || PPC || (SUPERH64 && BLK_DEV_IDEPCI) || SPARC | 1093 | def_bool ALPHA || (ARM && !ARCH_L7200) || BLACKFIN || X86 || IA64 || M32R || MIPS || PARISC || PPC || (SUPERH64 && BLK_DEV_IDEPCI) || SPARC |
1094 | 1094 | ||
1095 | config IDE_ARCH_OBSOLETE_DEFAULTS | ||
1096 | def_bool ALPHA || X86 || IA64 || M32R || MIPS || PPC32 | ||
1097 | |||
1095 | endif | 1098 | endif |
1096 | 1099 | ||
1097 | config BLK_DEV_HD_ONLY | 1100 | config BLK_DEV_HD_ONLY |
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c index 10ccf278d5be..6a196c27b0aa 100644 --- a/drivers/ide/ide-probe.c +++ b/drivers/ide/ide-probe.c | |||
@@ -1233,6 +1233,10 @@ static void drive_release_dev (struct device *dev) | |||
1233 | complete(&drive->gendev_rel_comp); | 1233 | complete(&drive->gendev_rel_comp); |
1234 | } | 1234 | } |
1235 | 1235 | ||
1236 | #ifndef ide_default_irq | ||
1237 | #define ide_default_irq(irq) 0 | ||
1238 | #endif | ||
1239 | |||
1236 | static int hwif_init(ide_hwif_t *hwif) | 1240 | static int hwif_init(ide_hwif_t *hwif) |
1237 | { | 1241 | { |
1238 | int old_irq; | 1242 | int old_irq; |
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c index c2fb5c964a51..a1a02c74d77f 100644 --- a/drivers/ide/ide.c +++ b/drivers/ide/ide.c | |||
@@ -165,6 +165,10 @@ static void ide_port_init_devices_data(ide_hwif_t *hwif) | |||
165 | } | 165 | } |
166 | } | 166 | } |
167 | 167 | ||
168 | #ifndef CONFIG_IDE_ARCH_OBSOLETE_DEFAULTS | ||
169 | # define ide_default_io_base(index) (0) | ||
170 | # define ide_init_default_irq(base) (0) | ||
171 | #endif | ||
168 | 172 | ||
169 | /* | 173 | /* |
170 | * init_ide_data() sets reasonable default values into all fields | 174 | * init_ide_data() sets reasonable default values into all fields |
diff --git a/drivers/ide/pci/ns87415.c b/drivers/ide/pci/ns87415.c index bf0d3b2931f1..75513320aad9 100644 --- a/drivers/ide/pci/ns87415.c +++ b/drivers/ide/pci/ns87415.c | |||
@@ -181,6 +181,10 @@ static int ns87415_ide_dma_setup(ide_drive_t *drive) | |||
181 | return 1; | 181 | return 1; |
182 | } | 182 | } |
183 | 183 | ||
184 | #ifndef ide_default_irq | ||
185 | #define ide_default_irq(irq) 0 | ||
186 | #endif | ||
187 | |||
184 | static void __devinit init_hwif_ns87415 (ide_hwif_t *hwif) | 188 | static void __devinit init_hwif_ns87415 (ide_hwif_t *hwif) |
185 | { | 189 | { |
186 | struct pci_dev *dev = to_pci_dev(hwif->dev); | 190 | struct pci_dev *dev = to_pci_dev(hwif->dev); |
diff --git a/include/asm-alpha/ide.h b/include/asm-alpha/ide.h index b7bf68d0407b..a2feed30bb68 100644 --- a/include/asm-alpha/ide.h +++ b/include/asm-alpha/ide.h | |||
@@ -13,9 +13,6 @@ | |||
13 | 13 | ||
14 | #ifdef __KERNEL__ | 14 | #ifdef __KERNEL__ |
15 | 15 | ||
16 | |||
17 | #define IDE_ARCH_OBSOLETE_DEFAULTS | ||
18 | |||
19 | static inline int ide_default_irq(unsigned long base) | 16 | static inline int ide_default_irq(unsigned long base) |
20 | { | 17 | { |
21 | switch (base) { | 18 | switch (base) { |
diff --git a/include/asm-ia64/ide.h b/include/asm-ia64/ide.h index 1ccf23809329..09c2a05e1c8a 100644 --- a/include/asm-ia64/ide.h +++ b/include/asm-ia64/ide.h | |||
@@ -16,8 +16,6 @@ | |||
16 | 16 | ||
17 | #include <linux/irq.h> | 17 | #include <linux/irq.h> |
18 | 18 | ||
19 | #define IDE_ARCH_OBSOLETE_DEFAULTS | ||
20 | |||
21 | static inline int ide_default_irq(unsigned long base) | 19 | static inline int ide_default_irq(unsigned long base) |
22 | { | 20 | { |
23 | switch (base) { | 21 | switch (base) { |
diff --git a/include/asm-m32r/ide.h b/include/asm-m32r/ide.h index 5d2044e529ab..feb7f0d7aca9 100644 --- a/include/asm-m32r/ide.h +++ b/include/asm-m32r/ide.h | |||
@@ -23,8 +23,6 @@ | |||
23 | # endif | 23 | # endif |
24 | #endif | 24 | #endif |
25 | 25 | ||
26 | #define IDE_ARCH_OBSOLETE_DEFAULTS | ||
27 | |||
28 | static __inline__ int ide_default_irq(unsigned long base) | 26 | static __inline__ int ide_default_irq(unsigned long base) |
29 | { | 27 | { |
30 | switch (base) { | 28 | switch (base) { |
diff --git a/include/asm-mips/mach-generic/ide.h b/include/asm-mips/mach-generic/ide.h index 4ec2b930dfbb..45e24474cf43 100644 --- a/include/asm-mips/mach-generic/ide.h +++ b/include/asm-mips/mach-generic/ide.h | |||
@@ -27,8 +27,6 @@ | |||
27 | # endif | 27 | # endif |
28 | #endif | 28 | #endif |
29 | 29 | ||
30 | #define IDE_ARCH_OBSOLETE_DEFAULTS | ||
31 | |||
32 | static __inline__ int ide_probe_legacy(void) | 30 | static __inline__ int ide_probe_legacy(void) |
33 | { | 31 | { |
34 | #ifdef CONFIG_PCI | 32 | #ifdef CONFIG_PCI |
diff --git a/include/asm-powerpc/ide.h b/include/asm-powerpc/ide.h index 06549456c953..fef2ef1dbe86 100644 --- a/include/asm-powerpc/ide.h +++ b/include/asm-powerpc/ide.h | |||
@@ -31,8 +31,6 @@ | |||
31 | #include <linux/hdreg.h> | 31 | #include <linux/hdreg.h> |
32 | #include <linux/ioport.h> | 32 | #include <linux/ioport.h> |
33 | 33 | ||
34 | #define IDE_ARCH_OBSOLETE_DEFAULTS | ||
35 | |||
36 | /* FIXME: use ide_platform host driver */ | 34 | /* FIXME: use ide_platform host driver */ |
37 | static __inline__ int ide_default_irq(unsigned long base) | 35 | static __inline__ int ide_default_irq(unsigned long base) |
38 | { | 36 | { |
diff --git a/include/asm-x86/ide.h b/include/asm-x86/ide.h index c2552d8bebf7..58080a7111de 100644 --- a/include/asm-x86/ide.h +++ b/include/asm-x86/ide.h | |||
@@ -20,8 +20,6 @@ | |||
20 | # endif | 20 | # endif |
21 | #endif | 21 | #endif |
22 | 22 | ||
23 | #define IDE_ARCH_OBSOLETE_DEFAULTS | ||
24 | |||
25 | static __inline__ int ide_default_irq(unsigned long base) | 23 | static __inline__ int ide_default_irq(unsigned long base) |
26 | { | 24 | { |
27 | switch (base) { | 25 | switch (base) { |
diff --git a/include/linux/ide.h b/include/linux/ide.h index 65445b7efc63..6c39482fd1a1 100644 --- a/include/linux/ide.h +++ b/include/linux/ide.h | |||
@@ -194,13 +194,6 @@ static inline void ide_std_init_ports(hw_regs_t *hw, | |||
194 | #define MAX_HWIFS CONFIG_IDE_MAX_HWIFS | 194 | #define MAX_HWIFS CONFIG_IDE_MAX_HWIFS |
195 | #endif | 195 | #endif |
196 | 196 | ||
197 | /* needed on alpha, x86/x86_64, ia64, mips, ppc32 and sh */ | ||
198 | #ifndef IDE_ARCH_OBSOLETE_DEFAULTS | ||
199 | # define ide_default_io_base(index) (0) | ||
200 | # define ide_default_irq(base) (0) | ||
201 | # define ide_init_default_irq(base) (0) | ||
202 | #endif | ||
203 | |||
204 | /* Currently only m68k, apus and m8xx need it */ | 197 | /* Currently only m68k, apus and m8xx need it */ |
205 | #ifndef IDE_ARCH_ACK_INTR | 198 | #ifndef IDE_ARCH_ACK_INTR |
206 | # define ide_ack_intr(hwif) (1) | 199 | # define ide_ack_intr(hwif) (1) |