Skip to content

Commit

Permalink
include/linux/of.h: provide of_n_{addr,size}_cells wrappers for !CONF…
Browse files Browse the repository at this point in the history
…IG_OF

The pci-rcar driver is enabled for compile tests, and this has shown that
the driver cannot build without CONFIG_OF, following the inclusion of
commit f8f2fe7 ("PCI: rcar: Use new OF interrupt mapping when possible"):

  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.

[[email protected]: be consistent with surrounding code]
Link: http://lkml.kernel.org/r/[email protected]
Fixes: c25da47 ("PCI: rcar: Add Renesas R-Car PCIe driver")
Signed-off-by: Arnd Bergmann <[email protected]>
Reviewed-by: Frank Rowand <[email protected]>
Acked-by: Geert Uytterhoeven <[email protected]>
Cc: Bjorn Helgaas <[email protected]>
Cc: Magnus Damm <[email protected]>
Cc: Ben Dooks <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
  • Loading branch information
arndb authored and torvalds committed Oct 13, 2017
1 parent c02c300 commit 8a1ac5d
Showing 1 changed file with 10 additions and 0 deletions.
10 changes: 10 additions & 0 deletions include/linux/of.h
Original file line number Diff line number Diff line change
Expand Up @@ -734,6 +734,16 @@ 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)
{
Expand Down

0 comments on commit 8a1ac5d

Please sign in to comment.