diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2011-10-29 00:26:00 +0200 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2012-01-06 21:10:54 +0100 |
| commit | 1e39ae9f9035ee02e014b5fe29461674fe19624d (patch) | |
| tree | 001fabe45ba74c019c99dca798260792a4400841 /drivers/pci | |
| parent | PCI: convert pci_scan_bus() to use pci_create_root_bus() (diff) | |
| download | linux-1e39ae9f9035ee02e014b5fe29461674fe19624d.tar.xz linux-1e39ae9f9035ee02e014b5fe29461674fe19624d.zip | |
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 <bhelgaas@google.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/probe.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index d09644b52d1c..04c2dc709276 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); |