[PATCH V2] powerpc/pci: remove the multi-init for pci_dn->phb

Gavin Shan gwshan at linux.vnet.ibm.com
Mon Dec 15 14:15:36 AEDT 2014


On Mon, Dec 15, 2014 at 09:45:00AM +0800, Wei Yang wrote:
>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 at linux.vnet.ibm.com>

Reviewed-by: Gavin Shan <gwshan at linux.vnet.ibm.com>

Thanks,
Gavin

>
>V2:
>   * rebase the code on v3.18
>---
> arch/powerpc/kernel/pci_dn.c |    4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
>diff --git a/arch/powerpc/kernel/pci_dn.c b/arch/powerpc/kernel/pci_dn.c
>index 1f61fab..83df307 100644
>--- a/arch/powerpc/kernel/pci_dn.c
>+++ b/arch/powerpc/kernel/pci_dn.c
>@@ -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);
>-- 
>1.7.9.5
>



More information about the Linuxppc-dev mailing list