lkml.org 
[lkml]   [2017]   [Apr]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH] PCI: generic: stop hiding pci_host_common_probe declaration
    On Tue, Mar 21, 2017 at 04:59:52PM +0100, Arnd Bergmann wrote:
    > When pci_host_common_probe() was moved into a separate module, the #ifdef around
    > the declaration was left in the header file, which can lead to build errors in
    > some configurations:
    >
    > drivers/pci/host/pci-thunder-pem.c: In function 'thunder_pem_probe':
    > drivers/pci/host/pci-thunder-pem.c:412:9: error: implicit declaration of function 'pci_host_common_probe';did you mean 'pci_host_bridge_priv'? [-Werror=implicit-function-declaration]
    >
    > The ifdef serves no real purpose anyway, so we can just remove it.
    >
    > Fixes: 4e64dbe226e7 ("PCI: generic: Expose pci_host_common_probe() for use by other drivers")

    It looks like 4e64dbe226e7 was merged for v4.6-rc1. Does that mean
    this build error has been there that long? Is there another, more
    recent commit that actually broke this?

    I suspect something broke in the v4.11 merge window, so I'm fishing
    for a commit from that window so I can include this for v4.11.

    > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    > ---
    > include/linux/pci-ecam.h | 2 --
    > 1 file changed, 2 deletions(-)
    >
    > diff --git a/include/linux/pci-ecam.h b/include/linux/pci-ecam.h
    > index f0d2b9451270..92a73847e1d3 100644
    > --- a/include/linux/pci-ecam.h
    > +++ b/include/linux/pci-ecam.h
    > @@ -68,9 +68,7 @@ extern struct pci_ecam_ops xgene_v1_pcie_ecam_ops; /* APM X-Gene PCIe v1 */
    > extern struct pci_ecam_ops xgene_v2_pcie_ecam_ops; /* APM X-Gene PCIe v2.x */
    > #endif
    >
    > -#ifdef CONFIG_PCI_HOST_GENERIC
    > /* for DT-based PCI controllers that support ECAM */
    > int pci_host_common_probe(struct platform_device *pdev,
    > struct pci_ecam_ops *ops);
    > #endif
    > -#endif
    > --
    > 2.9.0
    >

    \
     
     \ /
      Last update: 2017-04-03 23:33    [W:3.948 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site