Skip to content

Commit

Permalink
ide-generic: remove "no_pci_devices()" quirk from ide_default_io_base()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Bartlomiej Zolnierkiewicz committed Jul 24, 2008
1 parent dbdec83 commit b6cd7da
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 28 deletions.
18 changes: 4 additions & 14 deletions include/asm-mips/mach-generic/ide.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
18 changes: 4 additions & 14 deletions include/asm-x86/ide.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit b6cd7da

Please sign in to comment.