diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2011-10-29 00:28:08 +0200 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2012-01-06 21:11:13 +0100 |
| commit | 46fbade05ca0784ca3c959bd7bf2aae7d81306c2 (patch) | |
| tree | 3ae7eac1e40acd9d41813a8d44001659f811c8ba /arch/x86/pci/common.c | |
| parent | x86/PCI: read Broadcom CNB20LE host bridge info before PCI scan (diff) | |
| download | linux-46fbade05ca0784ca3c959bd7bf2aae7d81306c2.tar.xz linux-46fbade05ca0784ca3c959bd7bf2aae7d81306c2.zip | |
x86/PCI: use pci_scan_bus() instead of pci_scan_bus_parented()
This doesn't change any functionality, but it makes a subsequent patch
slightly simpler.
pci_scan_bus(NULL, ...) and pci_scan_bus_parented() are identical except
that pci_scan_bus() also calls pci_bus_add_devices():
pci_scan_bus_parented
pci_create_bus
pci_scan_child_bus
pci_scan_bus
pci_create_bus
pci_scan_child_bus
pci_bus_add_devices
All callers of pcibios_scan_root() call pci_bus_add_devices() explicitly,
and we don't pass a parent device, so we might as well use pci_scan_bus().
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'arch/x86/pci/common.c')
| -rw-r--r-- | arch/x86/pci/common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c index 7962ccb4d9b2..07c55ce6fdf5 100644 --- a/arch/x86/pci/common.c +++ b/arch/x86/pci/common.c @@ -456,7 +456,7 @@ struct pci_bus * __devinit pcibios_scan_root(int busnum) sd->node = get_mp_bus_to_node(busnum); printk(KERN_DEBUG "PCI: Probing PCI hardware (bus %02x)\n", busnum); - bus = pci_scan_bus_parented(NULL, busnum, &pci_root_ops, sd); + bus = pci_scan_bus(busnum, &pci_root_ops, sd); if (!bus) kfree(sd); |