From: Gavin Shan <shangw@linux.vnet.ibm.com>
Date: Wed, 30 May 2012 20:17:29 +0000 (+0000)
Subject: powerpc/pci: cleanup on duplicate assignment
X-Git-Tag: v3.6-rc1~132^2~59
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=8127e723dab6f6e7949da43f87e5f946c4b99cf2;p=~emulex%2Finfiniband.git

powerpc/pci: cleanup on duplicate assignment

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>
---

diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
index 8e78e93c818..0f75bd50040 100644
--- a/arch/powerpc/kernel/pci-common.c
+++ b/arch/powerpc/kernel/pci-common.c
@@ -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 */