Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5213a31 authored by Yinghai Lu's avatar Yinghai Lu Committed by Bjorn Helgaas
Browse files

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: default avatarYinghai Lu <yinghai@kernel.org>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 17787940

drivers/pci/probe.c

+21 −0
Original line number Diff line number Diff line
@@ -1890,6 +1890,27 @@ unsigned int __ref pci_rescan_bus_bridge_resize(struct pci_dev *bridge) 
	return max;

}



/**

 * pci_rescan_bus - scan a PCI bus for devices.

 * @bus: PCI bus to scan

 *

 * Scan a PCI bus and child buses for new devices, adds them,

 * and enables them.

 *

 * Returns the max number of subordinate bus discovered.

 */

unsigned int __ref pci_rescan_bus(struct pci_bus *bus)

{

	unsigned int max;



	max = pci_scan_child_bus(bus);

	pci_assign_unassigned_bus_resources(bus);

	pci_bus_add_devices(bus);



	return max;

}

EXPORT_SYMBOL_GPL(pci_rescan_bus);



EXPORT_SYMBOL(pci_add_new_bus);

EXPORT_SYMBOL(pci_scan_slot);

EXPORT_SYMBOL(pci_scan_bridge);

drivers/pci/setup-bus.c

+0 −23
Original line number Diff line number Diff line
@@ -1569,26 +1569,3 @@ void pci_assign_unassigned_bus_resources(struct pci_bus *bus) 


	pci_enable_bridges(bus);

}
 


#ifdef CONFIG_HOTPLUG

/**

 * pci_rescan_bus - scan a PCI bus for devices.

 * @bus: PCI bus to scan

 *

 * Scan a PCI bus and child buses for new devices, adds them,

 * and enables them.

 *

 * Returns the max number of subordinate bus discovered.

 */

unsigned int __ref pci_rescan_bus(struct pci_bus *bus)

{

	unsigned int max;



	max = pci_scan_child_bus(bus);

	pci_assign_unassigned_bus_resources(bus);

	pci_bus_add_devices(bus);



	return max;

}

EXPORT_SYMBOL_GPL(pci_rescan_bus);

#endif