diff options
author | Arnd Bergmann <arnd@arndb.de> | 2014-06-04 05:40:19 -0400 |
---|---|---|
committer | Rob Herring <robh@kernel.org> | 2014-06-04 05:45:46 -0400 |
commit | 64c5c759084e153272eb05f4103de3e0adf5a88a (patch) | |
tree | b2a52b800f1fc46347974c63d33068a64f370a0f | |
parent | 728dd198aa543397c88f6f8e35f4f187b2bbc09d (diff) |
of/irq: provide more wrappers for !CONFIG_OF
The pci-rcar driver is enabled for compile tests, and this has
now shown that the driver cannot build without CONFIG_OF,
following the inclusion of f8f2fe7355fb "PCI: rcar: Use new OF
interrupt mapping when possible":
drivers/built-in.o: In function `rcar_pci_map_irq':
:(.text+0x1cc7c): undefined reference to `of_irq_parse_and_map_pci'
pci/host/pcie-rcar.c: In function 'pci_dma_range_parser_init':
pci/host/pcie-rcar.c:875:2: error: implicit declaration of function 'of_n_addr_cells' [-Werror=implicit-function-declaration]
As pointed out by Ben Dooks and Geert Uytterhoeven, this is actually
supposed to build fine, which we can achieve if we make the
declaration of of_irq_parse_and_map_pci conditional on CONFIG_OF
and provide an empty inline function otherwise, as we do for
a lot of other of interfaces.
This lets us build the rcar_pci driver again without CONFIG_OF
for build testing. All platforms using this driver select OF,
so this doesn't change anything for the users.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: devicetree@vger.kernel.org
Cc: Rob Herring <robh+dt@kernel.org>
Cc: Grant Likely <grant.likely@linaro.org>
Cc: Lucas Stach <l.stach@pengutronix.de>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Magnus Damm <damm@opensource.se>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Ben Dooks <ben.dooks@codethink.co.uk>
Cc: linux-pci@vger.kernel.org
Cc: linux-sh@vger.kernel.org
[robh: drop wrappers for of_n_addr_cells and of_n_size_cells which are
low-level functions that should not be used for !OF]
Signed-off-by: Rob Herring <robh@kernel.org>
-rw-r--r-- | include/linux/of_pci.h | 36 |
1 files changed, 33 insertions, 3 deletions
diff --git a/include/linux/of_pci.h b/include/linux/of_pci.h index 1a1f5ffd5288..dde3a4a0fa5d 100644 --- a/include/linux/of_pci.h +++ b/include/linux/of_pci.h | |||
@@ -6,14 +6,44 @@ | |||
6 | 6 | ||
7 | struct pci_dev; | 7 | struct pci_dev; |
8 | struct of_phandle_args; | 8 | struct of_phandle_args; |
9 | int of_irq_parse_pci(const struct pci_dev *pdev, struct of_phandle_args *out_irq); | ||
10 | int of_irq_parse_and_map_pci(const struct pci_dev *dev, u8 slot, u8 pin); | ||
11 | |||
12 | struct device_node; | 9 | struct device_node; |
10 | |||
11 | #ifdef CONFIG_OF | ||
12 | int of_irq_parse_pci(const struct pci_dev *pdev, struct of_phandle_args *out_irq); | ||
13 | struct device_node *of_pci_find_child_device(struct device_node *parent, | 13 | struct device_node *of_pci_find_child_device(struct device_node *parent, |
14 | unsigned int devfn); | 14 | unsigned int devfn); |
15 | int of_pci_get_devfn(struct device_node *np); | 15 | int of_pci_get_devfn(struct device_node *np); |
16 | int of_irq_parse_and_map_pci(const struct pci_dev *dev, u8 slot, u8 pin); | ||
16 | int of_pci_parse_bus_range(struct device_node *node, struct resource *res); | 17 | int of_pci_parse_bus_range(struct device_node *node, struct resource *res); |
18 | #else | ||
19 | static inline int of_irq_parse_pci(const struct pci_dev *pdev, struct of_phandle_args *out_irq) | ||
20 | { | ||
21 | return 0; | ||
22 | } | ||
23 | |||
24 | static inline struct device_node *of_pci_find_child_device(struct device_node *parent, | ||
25 | unsigned int devfn) | ||
26 | { | ||
27 | return NULL; | ||
28 | } | ||
29 | |||
30 | static inline int of_pci_get_devfn(struct device_node *np) | ||
31 | { | ||
32 | return -EINVAL; | ||
33 | } | ||
34 | |||
35 | static inline int | ||
36 | of_irq_parse_and_map_pci(const struct pci_dev *dev, u8 slot, u8 pin) | ||
37 | { | ||
38 | return 0; | ||
39 | } | ||
40 | |||
41 | static inline int | ||
42 | of_pci_parse_bus_range(struct device_node *node, struct resource *res) | ||
43 | { | ||
44 | return -EINVAL; | ||
45 | } | ||
46 | #endif | ||
17 | 47 | ||
18 | #if defined(CONFIG_OF) && defined(CONFIG_PCI_MSI) | 48 | #if defined(CONFIG_OF) && defined(CONFIG_PCI_MSI) |
19 | int of_pci_msi_chip_add(struct msi_chip *chip); | 49 | int of_pci_msi_chip_add(struct msi_chip *chip); |