ide-generic: remove "no_pci_devices()" quirk from ide_default_io_base()

Since the decision to probe for ISA ide2-6 is now left to the user
"no_pci_devices()" quirk is no longer needed and may be removed.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>

2 files changed, 8 insertions, 28 deletions

diff --git a/include/asm-mips/mach-generic/ide.h b/include/asm-mips/mach-generic/ide.h
index 71a01c5aec16..f34740ee6775 100644
--- a/include/asm-mips/mach-generic/ide.h
+++ b/include/asm-mips/mach-generic/ide.h
@@ -72,23 +72,13 @@ static __inline__ int ide_default_irq(unsigned long base)
 
 static __inline__ unsigned long ide_default_io_base(int index)
 {
-        /*
-         *      If PCI is present then it is not safe to poke around
-         *      the other legacy IDE ports. Only 0x1f0 and 0x170 are
-         *      defined compatibility mode ports for PCI. A user can
-         *      override this using ide= but we must default safe.
-         */
-        if (no_pci_devices()) {
-                switch (index) {
-                case 2: return 0x1e8;
-                case 3: return 0x168;
-                case 4: return 0x1e0;
-                case 5: return 0x160;
-                }
-        }
         switch (index) {
         case 0: return 0x1f0;
         case 1: return 0x170;
+        case 2: return 0x1e8;
+        case 3: return 0x168;
+        case 4: return 0x1e0;
+        case 5: return 0x160;
         default:
                 return 0;
         }
diff --git a/include/asm-x86/ide.h b/include/asm-x86/ide.h
index cf9c98e5bdb5..34050747f38c 100644
--- a/include/asm-x86/ide.h
+++ b/include/asm-x86/ide.h
@@ -36,23 +36,13 @@ static __inline__ int ide_default_irq(unsigned long base)
 
 static __inline__ unsigned long ide_default_io_base(int index)
 {
-        /*
-         *      If PCI is present then it is not safe to poke around
-         *      the other legacy IDE ports. Only 0x1f0 and 0x170 are
-         *      defined compatibility mode ports for PCI. A user can 
-         *      override this using ide= but we must default safe.
-         */
-        if (no_pci_devices()) {
-                switch(index) {
-                        case 2: return 0x1e8;
-                        case 3: return 0x168;
-                        case 4: return 0x1e0;
-                        case 5: return 0x160;
-                }
-        }
         switch (index) {
                 case 0: return 0x1f0;
                 case 1: return 0x170;
+                case 2: return 0x1e8;
+                case 3: return 0x168;
+                case 4: return 0x1e0;
+                case 5: return 0x160;
                 default:
                         return 0;
         }