diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2017-09-07 13:24:19 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2017-09-07 13:24:19 -0500 |
| commit | 9198407e23ec89f0e1562f439771aeea83345d0d (patch) | |
| tree | c6a53b71b48c49d7713539eb035e7b2fcec69d2a /drivers/pci/probe.c | |
| parent | d872694bac212f76ca13fd20a85e5c1bdb53a945 (diff) | |
| parent | c775697b713b70293507573355aa8c8c177db35b (diff) | |
| download | linux-stable-9198407e23ec89f0e1562f439771aeea83345d0d.tar.gz linux-stable-9198407e23ec89f0e1562f439771aeea83345d0d.tar.bz2 linux-stable-9198407e23ec89f0e1562f439771aeea83345d0d.zip | |
Merge branch 'pci/resource' into next
* pci/resource:
microblaze/PCI: Remove pcibios_setup_bus_{self/devices} dead code
ARC: Remove empty kernel/pcibios.c
PCI: Add a generic weak pcibios_align_resource()
PCI: Add a generic weak pcibios_fixup_bus()
Diffstat (limited to 'drivers/pci/probe.c')
| -rw-r--r-- | drivers/pci/probe.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 9b8a445b9294..e03f95bd1b59 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -2344,6 +2344,15 @@ void pcie_bus_configure_settings(struct pci_bus *bus) } EXPORT_SYMBOL_GPL(pcie_bus_configure_settings); +/* + * Called after each bus is probed, but before its children are examined. This + * is marked as __weak because multiple architectures define it. + */ +void __weak pcibios_fixup_bus(struct pci_bus *bus) +{ + /* nothing to do, expected to be removed in the future */ +} + unsigned int pci_scan_child_bus(struct pci_bus *bus) { unsigned int devfn, pass, max = bus->busn_res.start; |