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/setup-bus.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/setup-bus.c')
-rw-r--r-- | drivers/pci/setup-bus.c | 23 |
1 files changed, 0 insertions, 23 deletions
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 | ||