diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2015-04-10 15:27:18 +0200 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2015-04-10 15:27:18 +0200 |
| commit | 5468d5a64bf1e002e5081fa280186d0eba09fa0e (patch) | |
| tree | a9c1500d4b0cfb9db1f822dc1357c184b0f2f188 /drivers/pci/host-bridge.c | |
| parent | Merge branches 'pci/host-exynos', 'pci/host-iproc', 'pci/host-keystone', 'pci... (diff) | |
| parent | PCI: Read capability list as dwords, not bytes (diff) | |
| download | linux-5468d5a64bf1e002e5081fa280186d0eba09fa0e.tar.xz linux-5468d5a64bf1e002e5081fa280186d0eba09fa0e.zip | |
Merge branch 'pci/misc' into next
* pci/misc:
PCI: Read capability list as dwords, not bytes
PCI: Don't clear ASPM bits when the FADT declares it's unsupported
PCI: Clarify policy for vendor IDs in pci.txt
PCI/ACPI: Optimize device state transition delays
PCI: Export pci_find_host_bridge() for use inside PCI core
PCI: Make a shareable UUID for PCI firmware ACPI _DSM
PCI: Fix typo in Thunderbolt kernel message
Diffstat (limited to 'drivers/pci/host-bridge.c')
| -rw-r--r-- | drivers/pci/host-bridge.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pci/host-bridge.c b/drivers/pci/host-bridge.c index 3e5bbf9e8889..5f4a2e04c8d7 100644 --- a/drivers/pci/host-bridge.c +++ b/drivers/pci/host-bridge.c @@ -16,7 +16,7 @@ static struct pci_bus *find_pci_root_bus(struct pci_bus *bus) return bus; } -static struct pci_host_bridge *find_pci_host_bridge(struct pci_bus *bus) +struct pci_host_bridge *pci_find_host_bridge(struct pci_bus *bus) { struct pci_bus *root_bus = find_pci_root_bus(bus); @@ -48,7 +48,7 @@ void pci_set_host_bridge_release(struct pci_host_bridge *bridge, void pcibios_resource_to_bus(struct pci_bus *bus, struct pci_bus_region *region, struct resource *res) { - struct pci_host_bridge *bridge = find_pci_host_bridge(bus); + struct pci_host_bridge *bridge = pci_find_host_bridge(bus); struct resource_entry *window; resource_size_t offset = 0; @@ -73,7 +73,7 @@ static bool region_contains(struct pci_bus_region *region1, void pcibios_bus_to_resource(struct pci_bus *bus, struct resource *res, struct pci_bus_region *region) { - struct pci_host_bridge *bridge = find_pci_host_bridge(bus); + struct pci_host_bridge *bridge = pci_find_host_bridge(bus); struct resource_entry *window; resource_size_t offset = 0; |