From: Bjorn Helgaas Date: Fri, 28 Oct 2011 22:26:00 +0000 (-0600) Subject: PCI: convert pci_scan_bus_parented() to use pci_create_root_bus() X-Git-Tag: next-20111214~74^2~30 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0c622f5285e9b345597a676f31aca36ecbb1c1d2;p=karo-tx-linux.git PCI: convert pci_scan_bus_parented() to use pci_create_root_bus() This converts pci_scan_bus_parented() to use pci_create_root_bus() instead of pci_create_bus(). The new bus still has the default (incorrect) resources, so this patch doesn't help fix that problem, but it does remove one more use of pci_create_bus(). Signed-off-by: Bjorn Helgaas Signed-off-by: Jesse Barnes --- diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 0cd2444bfd05..5fda6ac5974d 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1640,11 +1640,16 @@ struct pci_bus *pci_create_bus(struct device *parent, struct pci_bus * __devinit pci_scan_bus_parented(struct device *parent, int bus, struct pci_ops *ops, void *sysdata) { + LIST_HEAD(resources); struct pci_bus *b; - b = pci_create_bus(parent, bus, ops, sysdata); + pci_add_resource(&resources, &ioport_resource); + pci_add_resource(&resources, &iomem_resource); + b = pci_create_root_bus(parent, bus, ops, sysdata, &resources); if (b) b->subordinate = pci_scan_child_bus(b); + else + pci_free_resource_list(&resources); return b; } EXPORT_SYMBOL(pci_scan_bus_parented);