Commit 65b3841b authored by Guenter Roeck's avatar Guenter Roeck Committed by David S. Miller

of_net.h: Provide empty functions if OF_NET is not configured

of_get_mac_address() and of_get_phy_mode() are only provided if OF_NET
is configured. While most callers check for the define, not all do, and those
who do require #ifdef around the code. For those who don't, the missing check
can result in errors such as

arch/powerpc/sysdev/tsi108_dev.c:107:3: error: implicit declaration of
	function 'of_get_mac_address' [-Werror=implicit-function-declaration]
arch/powerpc/sysdev/mv64x60_dev.c:253:2: error: implicit declaration of
	function 'of_get_mac_address' [-Werror=implicit-function-declaration]

Provide empty functions if OF_NET is not configured.
This is safe because all callers do check the return values.

Cc: David Daney <david.daney@cavium.com>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Acked-by: default avatarRob Herring <rob.herring@calxeda.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5e404cd6
...@@ -11,6 +11,16 @@ ...@@ -11,6 +11,16 @@
#include <linux/of.h> #include <linux/of.h>
extern const int of_get_phy_mode(struct device_node *np); extern const int of_get_phy_mode(struct device_node *np);
extern const void *of_get_mac_address(struct device_node *np); extern const void *of_get_mac_address(struct device_node *np);
#else
static inline const int of_get_phy_mode(struct device_node *np)
{
return -ENODEV;
}
static inline const void *of_get_mac_address(struct device_node *np)
{
return NULL;
}
#endif #endif
#endif /* __LINUX_OF_NET_H */ #endif /* __LINUX_OF_NET_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment