From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-yh0-f46.google.com ([209.85.213.46]:60827 "EHLO mail-yh0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751009Ab3IFUak (ORCPT ); Fri, 6 Sep 2013 16:30:40 -0400 Received: by mail-yh0-f46.google.com with SMTP id c41so1157542yho.5 for ; Fri, 06 Sep 2013 13:30:39 -0700 (PDT) Date: Fri, 6 Sep 2013 14:30:35 -0600 From: Bjorn Helgaas To: Yijing Wang Cc: Benjamin Herrenschmidt , "James E.J. Bottomley" , Gavin Shan , linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, Hanjun Guo , Paul Mackerras , linuxppc-dev@lists.ozlabs.org Subject: Re: [PATCH v2 3/6] powerpc/pci: use pci_is_pcie() to simplify code Message-ID: <20130906203035.GA27940@google.com> References: <1378367730-25996-1-git-send-email-wangyijing@huawei.com> <1378367730-25996-3-git-send-email-wangyijing@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <1378367730-25996-3-git-send-email-wangyijing@huawei.com> Sender: linux-pci-owner@vger.kernel.org List-ID: On Thu, Sep 05, 2013 at 03:55:27PM +0800, Yijing Wang wrote: > Use pci_is_pcie() to simplify code. > > Acked-by: Kumar Gala > Reviewed-by: Gavin Shan > Signed-off-by: Yijing Wang > Cc: Gavin Shan > Cc: Benjamin Herrenschmidt > Cc: Paul Mackerras > 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(-) Ben, Paul, this has no dependencies on anything new to PCI or any other patches in this series, so you can take it through the POWERPC tree. If you don't want to do that, let me know and I can take it. If you want it: Acked-by: Bjorn Helgaas > diff --git a/arch/powerpc/kernel/eeh.c b/arch/powerpc/kernel/eeh.c > index 55593ee..6ebbe54 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 > >