diff options
| author | Wei Yang <weiyang@linux.vnet.ibm.com> | 2014-12-15 09:45:00 +0800 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2015-01-23 14:02:48 +1100 |
| commit | 145a2d0427a88e874f85e82e6fc42933a36f5a2b (patch) | |
| tree | 714280522ba66f8bbb78596af3d3dc4db65ca799 | |
| parent | 4e28784024a0d87f6f04250e46e8c9ac4f30e361 (diff) | |
| download | op-kernel-dev-145a2d0427a88e874f85e82e6fc42933a36f5a2b.zip op-kernel-dev-145a2d0427a88e874f85e82e6fc42933a36f5a2b.tar.gz | |
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>
| -rw-r--r-- | arch/powerpc/kernel/pci_dn.c | 4 |
1 files changed, 1 insertions, 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); |
