ide-generic: remove no longer needed ide_probe_legacy()

There is now a generic solution [ide_generic_check_pci_legacy_iobases()]
so MIPS-specific ide_probe_legacy() is no longer necessary.

Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

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 @@
 #include <linux/stddef.h>
 #include <asm/processor.h>
 
-static __inline__ int ide_probe_legacy(void)
-{
-#ifdef CONFIG_PCI
-        struct pci_dev *dev;
-        /*
-         * This can be called on the ide_setup() path, super-early in
-         * boot.  But the down_read() will enable local interrupts,
-         * which can cause some machines to crash.  So here we detect
-         * and flag that situation and bail out early.
-         */
-        if (no_pci_devices())
-                return 0;
-        dev = pci_get_class(PCI_CLASS_BRIDGE_EISA << 8, NULL);
-        if (dev)
-                goto found;
-        dev = pci_get_class(PCI_CLASS_BRIDGE_ISA << 8, NULL);
-        if (dev)
-                goto found;
-        return 0;
-found:
-        pci_dev_put(dev);
-        return 1;
-#elif defined(CONFIG_EISA) || defined(CONFIG_ISA)
-        return 1;
-#else
-        return 0;
-#endif
-}
-
 /* MIPS port and memory-mapped I/O string operations.  */
 static inline void __ide_flush_prologue(void)
 {
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)
         unsigned long io_addr;
         int i, rc = 0, primary = 0, secondary = 0;
 
-#ifdef CONFIG_MIPS
-        if (!ide_probe_legacy())
-                return -ENODEV;
-#endif
         ide_generic_check_pci_legacy_iobases(&primary, &secondary);
 
         if (!probe_mask) {