diff options
author | Yinghai Lu <yinghai@kernel.org> | 2012-10-30 16:31:21 -0400 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-11-03 18:20:07 -0400 |
commit | a5213a3194f73cd29c68128d1540ce81f03ba7b9 (patch) | |
tree | dd0259c3ad89271cc308a3404ca33f5fe071ee13 /drivers/pci/probe.c | |
parent | 1778794031aae75d4464904319d320edc3e77d39 (diff) |
PCI: Move pci_rescan_bus() back to probe.c
We have pci_assign_unassigned_bus_resources() in as global function now.
Move pci_rescan_bus() back to probe.c where it should be.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'drivers/pci/probe.c')
-rw-r--r-- | drivers/pci/probe.c | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index ec909afa90b6..65f62e353719 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c | |||
@@ -1890,6 +1890,27 @@ unsigned int __ref pci_rescan_bus_bridge_resize(struct pci_dev *bridge) | |||
1890 | return max; | 1890 | return max; |
1891 | } | 1891 | } |
1892 | 1892 | ||
1893 | /** | ||
1894 | * pci_rescan_bus - scan a PCI bus for devices. | ||
1895 | * @bus: PCI bus to scan | ||
1896 | * | ||
1897 | * Scan a PCI bus and child buses for new devices, adds them, | ||
1898 | * and enables them. | ||
1899 | * | ||
1900 | * Returns the max number of subordinate bus discovered. | ||
1901 | */ | ||
1902 | unsigned int __ref pci_rescan_bus(struct pci_bus *bus) | ||
1903 | { | ||
1904 | unsigned int max; | ||
1905 | |||
1906 | max = pci_scan_child_bus(bus); | ||
1907 | pci_assign_unassigned_bus_resources(bus); | ||
1908 | pci_bus_add_devices(bus); | ||
1909 | |||
1910 | return max; | ||
1911 | } | ||
1912 | EXPORT_SYMBOL_GPL(pci_rescan_bus); | ||
1913 | |||
1893 | EXPORT_SYMBOL(pci_add_new_bus); | 1914 | EXPORT_SYMBOL(pci_add_new_bus); |
1894 | EXPORT_SYMBOL(pci_scan_slot); | 1915 | EXPORT_SYMBOL(pci_scan_slot); |
1895 | EXPORT_SYMBOL(pci_scan_bridge); | 1916 | EXPORT_SYMBOL(pci_scan_bridge); |