diff options
Diffstat (limited to 'drivers/pci')
-rw-r--r-- | drivers/pci/probe.c | 21 | ||||
-rw-r--r-- | drivers/pci/setup-bus.c | 23 |
2 files changed, 21 insertions, 23 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); |
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index f64c071d6923..59e6c55c6d25 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c | |||
@@ -1569,26 +1569,3 @@ void pci_assign_unassigned_bus_resources(struct pci_bus *bus) | |||
1569 | 1569 | ||
1570 | pci_enable_bridges(bus); | 1570 | pci_enable_bridges(bus); |
1571 | } | 1571 | } |
1572 | |||
1573 | #ifdef CONFIG_HOTPLUG | ||
1574 | /** | ||
1575 | * pci_rescan_bus - scan a PCI bus for devices. | ||
1576 | * @bus: PCI bus to scan | ||
1577 | * | ||
1578 | * Scan a PCI bus and child buses for new devices, adds them, | ||
1579 | * and enables them. | ||
1580 | * | ||
1581 | * Returns the max number of subordinate bus discovered. | ||
1582 | */ | ||
1583 | unsigned int __ref pci_rescan_bus(struct pci_bus *bus) | ||
1584 | { | ||
1585 | unsigned int max; | ||
1586 | |||
1587 | max = pci_scan_child_bus(bus); | ||
1588 | pci_assign_unassigned_bus_resources(bus); | ||
1589 | pci_bus_add_devices(bus); | ||
1590 | |||
1591 | return max; | ||
1592 | } | ||
1593 | EXPORT_SYMBOL_GPL(pci_rescan_bus); | ||
1594 | #endif | ||