The pci-rcar driver is enabled for compile tests, and this has
shown that the driver cannot build without CONFIG_OF:
drivers/pci/host/pcie-rcar.c: In function 'pci_dma_range_parser_init':
drivers/pci/host/pcie-rcar.c:1039:2: error: implicit declaration of function
'of_n_addr_cells' [-Werror=implicit-function-declaration]
parser->pna = of_n_addr_cells(node);
^
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.
Cc: Bjorn Helgaas <bhelg...@google.com>
Cc: Magnus Damm <d...@opensource.se>
Cc: Geert Uytterhoeven <ge...@linux-m68k.org>
Cc: Ben Dooks <ben.do...@codethink.co.uk>
Cc: linux-...@vger.kernel.org
Cc: linux...@vger.kernel.org
Acked-by: Geert Uytterhoeven <geert+rene...@glider.be>
Reviewed-by: Frank Rowand <frank.row...@sony.com>
Fixes: c25da4778803 ("PCI: rcar: Add Renesas R-Car PCIe driver")
Signed-off-by: Arnd Bergmann <a...@arndb.de>
---
I originally sent the patch in 2014 when things initially broke
and then forgot about while it was applied in my randconfig patch
stack. I sent it again in 2016 without reply.
It's still broken and I think this is the correct fix.
v2: modify changelog as Geert suggested.
include/linux/of.h | 3 +++
1 file changed, 3 insertions(+)
diff --git a/include/linux/of.h b/include/linux/of.h
index 4a8a70916237..1efdbe53136c 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -735,6 +735,9 @@ static inline struct device_node *of_get_cpu_node(int cpu,
return NULL;
}
+static inline int of_n_addr_cells(struct device_node *np) { return 0; }
+static inline int of_n_size_cells(struct device_node *np) { return 0; }
+
static inline int of_property_read_u64(const struct device_node *np,
const char *propname, u64 *out_value)
{
--
2.9.0
