Skip to contentSkip to conversation

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

PATCH In review Guenter Roeck 3 participants 5 messages Apr 1, 2013 – Apr 2, 2013

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 of_net.h: Provide dummy 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 dummy function declarations if OF_NET is not configured. This is safe because all callers do check the return values. If desired, at least some of the #ifdefs in the code can subsequently be removed.

---
 include/linux/of_net.h |   10 ++++++++++
 1 file changed, 10 insertions(+)
include/linux/of_net.h +10 -0
index f474641..61bf53b 100644
@@ -11,6 +11,16 @@
 #include <linux/of.h>
 extern const int of_get_phy_mode(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 /* __LINUX_OF_NET_H */
Signature · 1 line
1.7.9.7
#1 lore raw
Quoted 4 lines · Guenter Roeck

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

How about removing the ifdef from those callers?

Rob

Quoted 38 lines

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 dummy function declarations if OF_NET is not configured. This is safe because all callers do check the return values. If desired, at least some of the #ifdefs in the code can subsequently be removed.

---
 include/linux/of_net.h |   10 ++++++++++
 1 file changed, 10 insertions(+)
include/linux/of_net.h +10 -0
index f474641..61bf53b 100644
@@ -11,6 +11,16 @@
 #include <linux/of.h>
 extern const int of_get_phy_mode(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 /* __LINUX_OF_NET_H */
#2 lore raw
Quoted 8 lines · Rob Herring
Quoted 4 lines · Guenter Roeck

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

How about removing the ifdef from those callers?

That would be the next step, after/if this one is accepted. If not, it doesn't make sense to waste my time.

Thanks,
Guenter

Quoted 42 lines

Rob

Quoted 38 lines

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 dummy function declarations if OF_NET is not configured. This is safe because all callers do check the return values. If desired, at least some of the #ifdefs in the code can subsequently be removed.

---
 include/linux/of_net.h |   10 ++++++++++
 1 file changed, 10 insertions(+)
include/linux/of_net.h +10 -0
index f474641..61bf53b 100644
@@ -11,6 +11,16 @@
 #include <linux/of.h>
 extern const int of_get_phy_mode(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 /* __LINUX_OF_NET_H */
Acked-by
#3 lore raw
Quoted 11 lines · Guenter Roeck
Quoted 8 lines · Rob Herring
Quoted 4 lines · Guenter Roeck

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

How about removing the ifdef from those callers?

That would be the next step, after/if this one is accepted. If not, it doesn't make sense to waste my time.

Assuming that is done:

Presumably with the follow-on patches, this can go in thru the net tree.

Rob

Quoted 45 lines

Thanks,
Guenter

Quoted 42 lines

Rob

Quoted 38 lines

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 dummy function declarations if OF_NET is not configured. This is safe because all callers do check the return values. If desired, at least some of the #ifdefs in the code can subsequently be removed.

Cc David Daney <david.daney-YGCgFSpz5w/[email protected]>
---
 include/linux/of_net.h |   10 ++++++++++
 1 file changed, 10 insertions(+)
include/linux/of_net.h +10 -0
index f474641..61bf53b 100644
@@ -11,6 +11,16 @@
 #include <linux/of.h>
 extern const int of_get_phy_mode(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 /* __LINUX_OF_NET_H */
maintainer
#4 lore raw

From: Rob Herring <[email protected]>
Date: Mon, 01 Apr 2013 14:14:10 -0500

Quoted 10 lines · Guenter Roeck
Quoted 9 lines · Rob Herring
Quoted 8 lines · Guenter Roeck
Quoted 4 lines

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

How about removing the ifdef from those callers?

Quoted 8 lines
Quoted 2 lines

That would be the next step, after/if this one is accepted. If not, it doesn't make sense to waste my time.

Assuming that is done:

Presumably with the follow-on patches, this can go in thru the net tree.

Indeed, please resubmit this with the follow-on cleanups.

Thanks.