UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Wei Yang 2014-12-15 09:45:00 +08:00 committed by Michael Ellerman
parent 4e28784024
commit 145a2d0427
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/powerpc/kernel/pci_dn.c
View File

@ -147,10 +147,8 @@ void pci_devs_phb_init_dynamic(struct pci_controller *phb)
/* PHB nodes themselves must not match */ /* PHB nodes themselves must not match */
update_dn_pci_info(dn, phb); update_dn_pci_info(dn, phb);
pdn = dn->data; pdn = dn->data;
if (pdn) { if (pdn)
pdn->devfn = pdn->busno = -1; pdn->devfn = pdn->busno = -1;
pdn->phb = phb;
}
/* Update dn->phb ptrs for new phb and children devices */ /* Update dn->phb ptrs for new phb and children devices */
traverse_pci_devices(dn, update_dn_pci_info, phb); traverse_pci_devices(dn, update_dn_pci_info, phb);