powerpc/pci: remove the multi-init for pci_dn->phb
authorWei Yang <weiyang@linux.vnet.ibm.com>
Mon, 15 Dec 2014 01:45:00 +0000 (09:45 +0800)
committerMichael Ellerman <mpe@ellerman.id.au>
Fri, 23 Jan 2015 03:02:48 +0000 (14:02 +1100)
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>
arch/powerpc/kernel/pci_dn.c

index 1f61fab59d9b282aedaa5dad969e760a90acb10e..83df3075d3df50b0b28ab5b53f14d5a1937031dd 100644 (file)
@@ -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);