diff options
author | Guenter Roeck <linux@roeck-us.net> | 2013-04-02 05:35:07 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-04-02 16:43:09 -0400 |
commit | 65b3841b9cb5fe1b239f12dbf033f9827d73d032 (patch) | |
tree | e5ced45fc13e3e8457624aa5937ce69e8a457e0d | |
parent | 5e404cd65860d6da7c08362e9e4d0b5dc40a9985 (diff) |
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: Guenter Roeck <linux@roeck-us.net>
Acked-by: Rob Herring <rob.herring@calxeda.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | include/linux/of_net.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/linux/of_net.h b/include/linux/of_net.h index f47464188710..61bf53b02779 100644 --- a/include/linux/of_net.h +++ b/include/linux/of_net.h | |||
@@ -11,6 +11,16 @@ | |||
11 | #include <linux/of.h> | 11 | #include <linux/of.h> |
12 | extern const int of_get_phy_mode(struct device_node *np); | 12 | extern const int of_get_phy_mode(struct device_node *np); |
13 | extern const void *of_get_mac_address(struct device_node *np); | 13 | extern const void *of_get_mac_address(struct device_node *np); |
14 | #else | ||
15 | static inline const int of_get_phy_mode(struct device_node *np) | ||
16 | { | ||
17 | return -ENODEV; | ||
18 | } | ||
19 | |||
20 | static inline const void *of_get_mac_address(struct device_node *np) | ||
21 | { | ||
22 | return NULL; | ||
23 | } | ||
14 | #endif | 24 | #endif |
15 | 25 | ||
16 | #endif /* __LINUX_OF_NET_H */ | 26 | #endif /* __LINUX_OF_NET_H */ |