| Message ID | 1418440144-12122-1-git-send-email-weiyang@linux.vnet.ibm.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
On Sat, Dec 13, 2014 at 11:09:04AM +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@linux.vnet.ibm.com> >--- > arch/powerpc/kernel/pci_dn.c | 1 - > 1 file changed, 1 deletion(-) > >diff --git a/arch/powerpc/kernel/pci_dn.c b/arch/powerpc/kernel/pci_dn.c >index ddae246..d40b579 100644 >--- a/arch/powerpc/kernel/pci_dn.c >+++ b/arch/powerpc/kernel/pci_dn.c >@@ -382,7 +382,6 @@ void pci_devs_phb_init_dynamic(struct pci_controller *phb) > pdn = dn->data; > if (pdn) { > pdn->devfn = pdn->busno = -1; >- pdn->phb = phb; > phb->firmware_data = pdn; It seems the patch bases on unmerged code because "phb->firmware_data" isn't existing yet in upstream or ppc.next. Thanks, Gavin > } > >-- >1.7.9.5 > >_______________________________________________ >Linuxppc-dev mailing list >Linuxppc-dev@lists.ozlabs.org >https://lists.ozlabs.org/listinfo/linuxppc-dev
On Sun, Dec 14, 2014 at 09:57:42PM +1100, Gavin Shan wrote: >On Sat, Dec 13, 2014 at 11:09:04AM +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@linux.vnet.ibm.com> >>--- >> arch/powerpc/kernel/pci_dn.c | 1 - >> 1 file changed, 1 deletion(-) >> >>diff --git a/arch/powerpc/kernel/pci_dn.c b/arch/powerpc/kernel/pci_dn.c >>index ddae246..d40b579 100644 >>--- a/arch/powerpc/kernel/pci_dn.c >>+++ b/arch/powerpc/kernel/pci_dn.c >>@@ -382,7 +382,6 @@ void pci_devs_phb_init_dynamic(struct pci_controller *phb) >> pdn = dn->data; >> if (pdn) { >> pdn->devfn = pdn->busno = -1; >>- pdn->phb = phb; >> phb->firmware_data = pdn; > >It seems the patch bases on unmerged code because "phb->firmware_data" >isn't existing yet in upstream or ppc.next. > Oh, my mistake. I will rebase it on the latest upstream. >Thanks, >Gavin > >> } >> >>-- >>1.7.9.5 >> >>_______________________________________________ >>Linuxppc-dev mailing list >>Linuxppc-dev@lists.ozlabs.org >>https://lists.ozlabs.org/listinfo/linuxppc-dev
diff --git a/arch/powerpc/kernel/pci_dn.c b/arch/powerpc/kernel/pci_dn.c index ddae246..d40b579 100644 --- a/arch/powerpc/kernel/pci_dn.c +++ b/arch/powerpc/kernel/pci_dn.c @@ -382,7 +382,6 @@ void pci_devs_phb_init_dynamic(struct pci_controller *phb) pdn = dn->data; if (pdn) { pdn->devfn = pdn->busno = -1; - pdn->phb = phb; phb->firmware_data = pdn; }
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> --- arch/powerpc/kernel/pci_dn.c | 1 - 1 file changed, 1 deletion(-)