From 52e13cc28ad2893e604650ccd72ddd0ea5fad509 Mon Sep 17 00:00:00 2001 From: Russell King Date: Sun, 16 Mar 2003 23:21:31 +0000 Subject: [PATCH] [PCI] pci-13: unuse pci_do_scan_bus() In an attempt to "unuse" pci_do_scan_bus() so it can be eventually killed, make pci_scan_bus_parented() call the new pci_scan_child_bus() and pci_bus_add_devices(). The only remaining callers are the hotplug drivers. Eventually, pci_bus_add_devices() will be removed from this function - it is intended that architectures should call this after they have done any setups and fixups to the scanned bus. It is legal to call pci_bus_add_devices() on a bus which has already had this function called, so architectures could update today. --- drivers/pci/probe.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index f07cb365cf82b..88b30de4726ac 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -663,7 +663,8 @@ struct pci_bus * __devinit pci_scan_bus_parented(struct device *parent, int bus, if (b) { b->sysdata = sysdata; b->ops = ops; - b->subordinate = pci_do_scan_bus(b); + b->subordinate = pci_scan_child_bus(b); + pci_bus_add_devices(b); } return b; } -- 2.53.0