Commit 145a2d04 authored Dec 15, 2014 by Wei Yang Committed by Michael Ellerman Jan 23, 2015

powerpc/pci: remove the multi-init for pci_dn->phb



pci_dn->phb is set to phb in update_dn_pci_info(), if succeed.

This patch removes the duplication of pci_dn->phb initialization.

Signed-off-by: Wei Yang <weiyang@linux.vnet.ibm.com>
Reviewed-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>

parent 4e287840

arch/powerpc/kernel/pci_dn.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -147,10 +147,8 @@ void pci_devs_phb_init_dynamic(struct pci_controller *phb)
		/* PHB nodes themselves must not match */
		update_dn_pci_info(dn, phb);
		pdn = dn->data;
		if (pdn) {
		if (pdn)
		pdn->devfn = pdn->busno = -1;
		pdn->phb = phb;
		}

		/* Update dn->phb ptrs for new phb and children devices */
		traverse_pci_devices(dn, update_dn_pci_info, phb);