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: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent dbdec839
...@@ -72,23 +72,13 @@ static __inline__ int ide_default_irq(unsigned long base) ...@@ -72,23 +72,13 @@ static __inline__ int ide_default_irq(unsigned long base)
static __inline__ unsigned long ide_default_io_base(int index) 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) { switch (index) {
case 0: return 0x1f0;
case 1: return 0x170;
case 2: return 0x1e8; case 2: return 0x1e8;
case 3: return 0x168; case 3: return 0x168;
case 4: return 0x1e0; case 4: return 0x1e0;
case 5: return 0x160; case 5: return 0x160;
}
}
switch (index) {
case 0: return 0x1f0;
case 1: return 0x170;
default: default:
return 0; return 0;
} }
......
...@@ -36,23 +36,13 @@ static __inline__ int ide_default_irq(unsigned long base) ...@@ -36,23 +36,13 @@ static __inline__ int ide_default_irq(unsigned long base)
static __inline__ unsigned long ide_default_io_base(int index) static __inline__ unsigned long ide_default_io_base(int index)
{ {
/* switch (index) {
* If PCI is present then it is not safe to poke around case 0: return 0x1f0;
* the other legacy IDE ports. Only 0x1f0 and 0x170 are case 1: return 0x170;
* 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 2: return 0x1e8;
case 3: return 0x168; case 3: return 0x168;
case 4: return 0x1e0; case 4: return 0x1e0;
case 5: return 0x160; case 5: return 0x160;
}
}
switch (index) {
case 0: return 0x1f0;
case 1: return 0x170;
default: default:
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment