| Message ID | 1378193715-25328-3-git-send-email-wangyijing@huawei.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
>Use pci_is_pcie() to simplify code. > >Signed-off-by: Yijing Wang <wangyijing@huawei.com> >Cc: Gavin Shan <shangw@linux.vnet.ibm.com> >Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> >Cc: Paul Mackerras <paulus@samba.org> >Cc: linuxppc-dev@lists.ozlabs.org >Cc: linux-kernel@vger.kernel.org It looks good to me: Reviewed-by: Gavin Shan <shangw@linux.vnet.ibm.com> Thanks, Gavin >--- > arch/powerpc/kernel/eeh.c | 3 +-- > arch/powerpc/sysdev/fsl_pci.c | 2 +- > 2 files changed, 2 insertions(+), 3 deletions(-) > >diff --git a/arch/powerpc/kernel/eeh.c b/arch/powerpc/kernel/eeh.c >index 39954fe..b0bd41a 100644 >--- a/arch/powerpc/kernel/eeh.c >+++ b/arch/powerpc/kernel/eeh.c >@@ -189,8 +189,7 @@ static size_t eeh_gather_pci_data(struct eeh_dev *edev, char * buf, size_t len) > } > > /* If PCI-E capable, dump PCI-E cap 10, and the AER */ >- cap = pci_find_capability(dev, PCI_CAP_ID_EXP); >- if (cap) { >+ if (pci_is_pcie(dev)) { > n += scnprintf(buf+n, len-n, "pci-e cap10:\n"); > printk(KERN_WARNING > "EEH: PCI-E capabilities and status follow:\n"); >diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c >index 46ac1dd..5402a1d 100644 >--- a/arch/powerpc/sysdev/fsl_pci.c >+++ b/arch/powerpc/sysdev/fsl_pci.c >@@ -41,7 +41,7 @@ static void quirk_fsl_pcie_header(struct pci_dev *dev) > u8 hdr_type; > > /* if we aren't a PCIe don't bother */ >- if (!pci_find_capability(dev, PCI_CAP_ID_EXP)) >+ if (!pci_is_pcie(dev)) > return; > > /* if we aren't in host mode don't bother */ >-- >1.7.1 > >
On Sep 3, 2013, at 2:35 AM, Yijing Wang wrote: > Use pci_is_pcie() to simplify code. > > Signed-off-by: Yijing Wang <wangyijing@huawei.com> > Cc: Gavin Shan <shangw@linux.vnet.ibm.com> > Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> > Cc: Paul Mackerras <paulus@samba.org> > Cc: linuxppc-dev@lists.ozlabs.org > Cc: linux-kernel@vger.kernel.org > --- > arch/powerpc/kernel/eeh.c | 3 +-- > arch/powerpc/sysdev/fsl_pci.c | 2 +- > 2 files changed, 2 insertions(+), 3 deletions(-) Acked-by: Kumar Gala <galak@kernel.crashing.org> (for the fsl_pci.c) change - k
diff --git a/arch/powerpc/kernel/eeh.c b/arch/powerpc/kernel/eeh.c index 39954fe..b0bd41a 100644 --- a/arch/powerpc/kernel/eeh.c +++ b/arch/powerpc/kernel/eeh.c @@ -189,8 +189,7 @@ static size_t eeh_gather_pci_data(struct eeh_dev *edev, char * buf, size_t len) } /* If PCI-E capable, dump PCI-E cap 10, and the AER */ - cap = pci_find_capability(dev, PCI_CAP_ID_EXP); - if (cap) { + if (pci_is_pcie(dev)) { n += scnprintf(buf+n, len-n, "pci-e cap10:\n"); printk(KERN_WARNING "EEH: PCI-E capabilities and status follow:\n"); diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c index 46ac1dd..5402a1d 100644 --- a/arch/powerpc/sysdev/fsl_pci.c +++ b/arch/powerpc/sysdev/fsl_pci.c @@ -41,7 +41,7 @@ static void quirk_fsl_pcie_header(struct pci_dev *dev) u8 hdr_type; /* if we aren't a PCIe don't bother */ - if (!pci_find_capability(dev, PCI_CAP_ID_EXP)) + if (!pci_is_pcie(dev)) return; /* if we aren't in host mode don't bother */
Use pci_is_pcie() to simplify code. Signed-off-by: Yijing Wang <wangyijing@huawei.com> Cc: Gavin Shan <shangw@linux.vnet.ibm.com> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Paul Mackerras <paulus@samba.org> Cc: linuxppc-dev@lists.ozlabs.org Cc: linux-kernel@vger.kernel.org --- arch/powerpc/kernel/eeh.c | 3 +-- arch/powerpc/sysdev/fsl_pci.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-)