ide-generic: remove no longer needed ide_probe_legacy()
PATCH 4/5 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 <[email protected]>
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
--- drivers/ide/ide-generic.c | 4 ---- include/asm-mips/mach-generic/ide.h | 29 ----------------------------- 2 files changed, 33 deletions(-)
drivers/ide/ide-generic.c +0 -4
@@ -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) {
include/asm-mips/mach-generic/ide.h +0 -29
@@ -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 ) {