Skip to content

Commit b1d06b6

Browse files
groeckrobherring
authored andcommitted
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: 876133d ("net: hisilicon: add OF dependency") Cc: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Guenter Roeck <linux@roeck-us.net> Reviewed-by: Arnd Bergmann <arnd@arndb.de> Reviewed-by: Frank Rowand <frank.rowand@sonymobile.com> Signed-off-by: Rob Herring <robh@kernel.org>
1 parent 1cc8e34 commit b1d06b6

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

include/linux/of.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,8 @@ extern raw_spinlock_t devtree_lock;
126126
#define OF_POPULATED 3 /* device already created for the node */
127127
#define OF_POPULATED_BUS 4 /* of_platform_populate recursed to children of this node */
128128

129+
#define OF_BAD_ADDR ((u64)-1)
130+
129131
#ifdef CONFIG_OF
130132
void of_core_init(void);
131133

@@ -229,8 +231,6 @@ static inline unsigned long of_read_ulong(const __be32 *cell, int size)
229231
#define OF_IS_DYNAMIC(x) test_bit(OF_DYNAMIC, &x->_flags)
230232
#define OF_MARK_DYNAMIC(x) set_bit(OF_DYNAMIC, &x->_flags)
231233

232-
#define OF_BAD_ADDR ((u64)-1)
233-
234234
static inline const char *of_node_full_name(const struct device_node *np)
235235
{
236236
return np ? np->full_name : "<no-node>";

include/linux/of_address.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,13 @@ extern int of_dma_get_range(struct device_node *np, u64 *dma_addr,
5757
u64 *paddr, u64 *size);
5858
extern bool of_dma_is_coherent(struct device_node *np);
5959
#else /* CONFIG_OF_ADDRESS */
60+
61+
static inline u64 of_translate_address(struct device_node *np,
62+
const __be32 *addr)
63+
{
64+
return OF_BAD_ADDR;
65+
}
66+
6067
static inline struct device_node *of_find_matching_node_by_address(
6168
struct device_node *from,
6269
const struct of_device_id *matches,

0 commit comments

Comments
 (0)