aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/mips/include/asm/mach-generic/ide.h29
-rw-r--r--drivers/ide/ide-generic.c4
2 files changed, 0 insertions, 33 deletions
diff --git a/arch/mips/include/asm/mach-generic/ide.h b/arch/mips/include/asm/mach-generic/ide.h
index 73008f7bdc93..9c93a5b36f2a 100644
--- a/arch/mips/include/asm/mach-generic/ide.h
+++ b/arch/mips/include/asm/mach-generic/ide.h
@@ -19,35 +19,6 @@
19#include <linux/stddef.h> 19#include <linux/stddef.h>
20#include <asm/processor.h> 20#include <asm/processor.h>
21 21
22static __inline__ int ide_probe_legacy(void)
23{
24#ifdef CONFIG_PCI
25 struct pci_dev *dev;
26 /*
27 * This can be called on the ide_setup() path, super-early in
28 * boot. But the down_read() will enable local interrupts,
29 * which can cause some machines to crash. So here we detect
30 * and flag that situation and bail out early.
31 */
32 if (no_pci_devices())
33 return 0;
34 dev = pci_get_class(PCI_CLASS_BRIDGE_EISA << 8, NULL);
35 if (dev)
36 goto found;
37 dev = pci_get_class(PCI_CLASS_BRIDGE_ISA << 8, NULL);
38 if (dev)
39 goto found;
40 return 0;
41found:
42 pci_dev_put(dev);
43 return 1;
44#elif defined(CONFIG_EISA) || defined(CONFIG_ISA)
45 return 1;
46#else
47 return 0;
48#endif
49}
50
51/* MIPS port and memory-mapped I/O string operations. */ 22/* MIPS port and memory-mapped I/O string operations. */
52static inline void __ide_flush_prologue(void) 23static inline void __ide_flush_prologue(void)
53{ 24{
diff --git a/drivers/ide/ide-generic.c b/drivers/ide/ide-generic.c
index 3104dc8d5b61..81a5282ce1eb 100644
--- a/drivers/ide/ide-generic.c
+++ b/drivers/ide/ide-generic.c
@@ -141,10 +141,6 @@ static int __init ide_generic_init(void)
141 unsigned long io_addr; 141 unsigned long io_addr;
142 int i, rc = 0, primary = 0, secondary = 0; 142 int i, rc = 0, primary = 0, secondary = 0;
143 143
144#ifdef CONFIG_MIPS
145 if (!ide_probe_legacy())
146 return -ENODEV;
147#endif
148 ide_generic_check_pci_legacy_iobases(&primary, &secondary); 144 ide_generic_check_pci_legacy_iobases(&primary, &secondary);
149 145
150 if (!probe_mask) { 146 if (!probe_mask) {