diff options
| author | Yinghai Lu <yinghai@kernel.org> | 2013-12-09 22:54:40 -0800 |
|---|---|---|
| committer | Zefan Li <lizefan@huawei.com> | 2015-06-19 11:40:34 +0800 |
| commit | bded67cc51db4e29af84f9ec1d671a86b0b6763b (patch) | |
| tree | 886108ad45fd36ac490e2e74c10d853b39e91566 /drivers/pci/quirks.c | |
| parent | edf76233db20b417ad0cb88cc9f4d4001fef1bd3 (diff) | |
PCI: Convert pcibios_resource_to_bus() to take a pci_bus, not a pci_dev
commit fc2798502f860b18f3c7121e4dc659d3d9d28d74 upstream.
These interfaces:
pcibios_resource_to_bus(struct pci_dev *dev, *bus_region, *resource)
pcibios_bus_to_resource(struct pci_dev *dev, *resource, *bus_region)
took a pci_dev, but they really depend only on the pci_bus. And we want to
use them in resource allocation paths where we have the bus but not a
device, so this patch converts them to take the pci_bus instead of the
pci_dev:
pcibios_resource_to_bus(struct pci_bus *bus, *bus_region, *resource)
pcibios_bus_to_resource(struct pci_bus *bus, *resource, *bus_region)
In fact, with standard PCI-PCI bridges, they only depend on the host
bridge, because that's the only place address translation occurs, but
we aren't going that far yet.
[bhelgaas: changelog]
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: Dirk Behme <dirk.behme@gmail.com>
[lizf: Backported to 3.4:
- make changes to pci_host_bridge() instead of find_pci_root_bus()
- adjust context]
Signed-off-by: Zefan Li <lizefan@huawei.com>
Diffstat (limited to 'drivers/pci/quirks.c')
| -rw-r--r-- | drivers/pci/quirks.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index ffde183ac1b3..c0300242db86 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -393,7 +393,7 @@ static void __devinit quirk_io_region(struct pci_dev *dev, unsigned region, /* Convert from PCI bus to resource space. */ bus_region.start = res->start; bus_region.end = res->end; - pcibios_bus_to_resource(dev, res, &bus_region); + pcibios_bus_to_resource(dev->bus, res, &bus_region); if (pci_claim_resource(dev, nr) == 0) dev_info(&dev->dev, "quirk: %pR claimed by %s\n", |