diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-06-06 22:42:01 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-06-06 22:42:01 -0400 |
commit | 9973e38575070b70c68bad177fb5056548fea349 (patch) | |
tree | e4b919a6199fdcaa35eac225c6fa34c0cc5b2a16 | |
parent | 42edb1d306d7941405b5ba5e7599ea99fc4bdf5a (diff) |
sh: Fix up IORESOURCE_PCI_FIXED usage in pcibios_fixup_device_resources().
pcibios_fixup_device_resources() presently skips over resources flagged
with IORESOURCE_PCI_FIXED, which is a remnant of the old PCI-auto code.
The only user for this at present is the Dreamast GAPSPCI code which
can't tolerate any adjustments to the BARs, but a combination of the
IORESOURCE_PCI_FIXED and zeroed out hose offsets does the right thing for
this case already, so we simply kill off the special casing.
Reported-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r-- | arch/sh/drivers/pci/pci.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/sh/drivers/pci/pci.c b/arch/sh/drivers/pci/pci.c index 953af139e230..1e9598d2bbf4 100644 --- a/arch/sh/drivers/pci/pci.c +++ b/arch/sh/drivers/pci/pci.c | |||
@@ -139,8 +139,6 @@ static void pcibios_fixup_device_resources(struct pci_dev *dev, | |||
139 | for (i = 0; i < PCI_NUM_RESOURCES; i++) { | 139 | for (i = 0; i < PCI_NUM_RESOURCES; i++) { |
140 | if (!dev->resource[i].start) | 140 | if (!dev->resource[i].start) |
141 | continue; | 141 | continue; |
142 | if (dev->resource[i].flags & IORESOURCE_PCI_FIXED) | ||
143 | continue; | ||
144 | if (dev->resource[i].flags & IORESOURCE_IO) | 142 | if (dev->resource[i].flags & IORESOURCE_IO) |
145 | offset = hose->io_offset; | 143 | offset = hose->io_offset; |
146 | else if (dev->resource[i].flags & IORESOURCE_MEM) | 144 | else if (dev->resource[i].flags & IORESOURCE_MEM) |