]> git.karo-electronics.de Git - linux-beck.git/commitdiff
powerpc/pci: cleanup on duplicate assignment
authorGavin Shan <shangw@linux.vnet.ibm.com>
Wed, 30 May 2012 20:17:29 +0000 (20:17 +0000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 3 Jul 2012 04:14:45 +0000 (14:14 +1000)
While creating the PCI root bus through function pci_create_root_bus()
of PCI core, it should have assigned the secondary bus number for the
newly created PCI root bus. Thus we needn't do the explicit assignment
for the secondary bus number again in pcibios_scan_phb().

Signed-off-by: Gavin Shan <shangw@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
arch/powerpc/kernel/pci-common.c

index 8e78e93c818536b4a33a1ae29f10b3d157b29e63..0f75bd50040418a0b36a4b33c3eaf5fd7fc0cdaa 100644 (file)
@@ -1646,7 +1646,6 @@ void __devinit pcibios_scan_phb(struct pci_controller *hose)
                pci_free_resource_list(&resources);
                return;
        }
-       bus->secondary = hose->first_busno;
        hose->bus = bus;
 
        /* Get probe mode and perform scan */