From b74dff46cebe36e77d56c211418a21ccbe155572 Mon Sep 17 00:00:00 2001 From: Bjorn Helgaas Date: Fri, 28 Oct 2011 16:28:08 -0600 Subject: [PATCH] --- yaml --- r: 283385 b: refs/heads/master c: 46fbade05ca0784ca3c959bd7bf2aae7d81306c2 h: refs/heads/master i: 283383: 62afd7a604d9340f17f83a4dfa18ee5b735a5879 v: v3 --- [refs] | 2 +- trunk/arch/x86/pci/common.c | 2 +- trunk/arch/x86/pci/legacy.c | 3 --- trunk/arch/x86/pci/numaq_32.c | 2 -- 4 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 2d44644017c3..521225a51af9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6361d72b04d1f77736142bc3911a32b814370729 +refs/heads/master: 46fbade05ca0784ca3c959bd7bf2aae7d81306c2 diff --git a/trunk/arch/x86/pci/common.c b/trunk/arch/x86/pci/common.c index 7962ccb4d9b2..07c55ce6fdf5 100644 --- a/trunk/arch/x86/pci/common.c +++ b/trunk/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); diff --git a/trunk/arch/x86/pci/legacy.c b/trunk/arch/x86/pci/legacy.c index 2c2aeabc2609..a1df191129d3 100644 --- a/trunk/arch/x86/pci/legacy.c +++ b/trunk/arch/x86/pci/legacy.c @@ -31,9 +31,6 @@ int __init pci_legacy_init(void) printk("PCI: Probing PCI hardware\n"); pci_root_bus = pcibios_scan_root(0); - if (pci_root_bus) - pci_bus_add_devices(pci_root_bus); - return 0; } diff --git a/trunk/arch/x86/pci/numaq_32.c b/trunk/arch/x86/pci/numaq_32.c index 51abf02f9226..83e125b95ca6 100644 --- a/trunk/arch/x86/pci/numaq_32.c +++ b/trunk/arch/x86/pci/numaq_32.c @@ -153,8 +153,6 @@ int __init pci_numaq_init(void) raw_pci_ops = &pci_direct_conf1_mq; pci_root_bus = pcibios_scan_root(0); - if (pci_root_bus) - pci_bus_add_devices(pci_root_bus); if (num_online_nodes() > 1) for_each_online_node(quad) { if (quad == 0)