diff options
| author | Robin Murphy <robin.murphy@arm.com> | 2016-06-07 18:44:48 +0100 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2016-06-08 08:18:06 -0500 |
| commit | 5c1d3310d84309330264e2a06e5000eb289a44ad (patch) | |
| tree | bd5e6c7bb3559a63479ff97e6bc92be529bc59fe | |
| parent | 3eefa7e8cc8516d737a6a961914e20501eb2a952 (diff) | |
| download | op-kernel-dev-5c1d3310d84309330264e2a06e5000eb289a44ad.zip op-kernel-dev-5c1d3310d84309330264e2a06e5000eb289a44ad.tar.gz | |
drivers: of: Fix of_pci.h header guard
The compilation of of_pci.c is governed by CONFIG_OF_PCI, but the
corresponding declarations in of_pci.h are inconsistently guarded by
CONFIG_OF, with the result that if CONFIG_PCI is disabled for an OF
platform, the dangling external declarations are still active and the
inline stub definitions not. So far this has managed to go unnoticed
since it happens that the only references to these functions are from
code which itself depends on CONFIG_PCI or CONFIG_OF_PCI.
Fix this with the appropriate config guard so that any new callers
outside PCI-specific code don't start unexpectedly breaking under
certain configs.
Signed-off-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Rob Herring <robh@kernel.org>
| -rw-r--r-- | include/linux/of_pci.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/of_pci.h b/include/linux/of_pci.h index f6e9e85..b969e94 100644 --- a/include/linux/of_pci.h +++ b/include/linux/of_pci.h @@ -8,7 +8,7 @@ struct pci_dev; struct of_phandle_args; struct device_node; -#ifdef CONFIG_OF +#ifdef CONFIG_OF_PCI int of_irq_parse_pci(const struct pci_dev *pdev, struct of_phandle_args *out_irq); struct device_node *of_pci_find_child_device(struct device_node *parent, unsigned int devfn); |
