Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1d06b60 authored by Guenter Roeck's avatar Guenter Roeck Committed by Rob Herring
Browse files

of: Provide static inline function for of_translate_address if needed 



If OF_ADDRESS is not configured, builds can fail with errors such as

drivers/net/ethernet/hisilicon/hns_mdio.c:
	In function 'hns_mdio_bus_name':
drivers/net/ethernet/hisilicon/hns_mdio.c:411:3:
	error: implicit declaration of function 'of_translate_address'

as currently seen when building sparc:allmodconfig.

Introduce a static inline function if OF_ADDRESS is not configured to fix
the build failure. Return OF_BAD_ADDR in this case. For this to work, the
definition of OF_BAD_ADDR has to be moved outside CONFIG_OF conditional
code.

Fixes: 876133d3 ("net: hisilicon: add OF dependency")
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
Reviewed-by: default avatarFrank Rowand <frank.rowand@sonymobile.com>
Signed-off-by: default avatarRob Herring <robh@kernel.org>
parent 1cc8e345

include/linux/of.h

+2 −2
Original line number Diff line number Diff line
@@ -126,6 +126,8 @@ extern raw_spinlock_t devtree_lock; 
#define OF_POPULATED	3 /* device already created for the node */

#define OF_POPULATED_BUS	4 /* of_platform_populate recursed to children of this node */



#define OF_BAD_ADDR	((u64)-1)



#ifdef CONFIG_OF

void of_core_init(void);
@@ -229,8 +231,6 @@ static inline unsigned long of_read_ulong(const __be32 *cell, int size) 
#define OF_IS_DYNAMIC(x) test_bit(OF_DYNAMIC, &x->_flags)

#define OF_MARK_DYNAMIC(x) set_bit(OF_DYNAMIC, &x->_flags)



#define OF_BAD_ADDR	((u64)-1)



static inline const char *of_node_full_name(const struct device_node *np)

{

	return np ? np->full_name : "<no-node>";

include/linux/of_address.h

+7 −0
Original line number Diff line number Diff line
@@ -57,6 +57,13 @@ extern int of_dma_get_range(struct device_node *np, u64 *dma_addr, 
				u64 *paddr, u64 *size);

extern bool of_dma_is_coherent(struct device_node *np);

#else /* CONFIG_OF_ADDRESS */



static inline u64 of_translate_address(struct device_node *np,

				       const __be32 *addr)

{

	return OF_BAD_ADDR;

}



static inline struct device_node *of_find_matching_node_by_address(

					struct device_node *from,

					const struct of_device_id *matches,