From: Paul Mundt Date: Mon, 7 Jun 2010 02:42:01 +0000 (+0900) Subject: sh: Fix up IORESOURCE_PCI_FIXED usage in pcibios_fixup_device_resources(). X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=9973e38575070b70c68bad177fb5056548fea349;p=deliverable%2Flinux.git 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 Signed-off-by: Paul Mundt --- 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, for (i = 0; i < PCI_NUM_RESOURCES; i++) { if (!dev->resource[i].start) continue; - if (dev->resource[i].flags & IORESOURCE_PCI_FIXED) - continue; if (dev->resource[i].flags & IORESOURCE_IO) offset = hose->io_offset; else if (dev->resource[i].flags & IORESOURCE_MEM)