[PATCH] param: dev_add_param_mac() depends on CONFIG_NET
Markus Pargmann
mpa at pengutronix.de
Fri Oct 2 05:35:01 PDT 2015
This patch adds the proper inline function for CONFIG_PARAMETER && !
CONFIG_NET.
Signed-off-by: Markus Pargmann <mpa at pengutronix.de>
---
include/param.h | 21 +++++++++++++--------
1 file changed, 13 insertions(+), 8 deletions(-)
diff --git a/include/param.h b/include/param.h
index 3a851fc552a4..f8a2534ef3a8 100644
--- a/include/param.h
+++ b/include/param.h
@@ -63,10 +63,12 @@ struct param_d *dev_add_param_ip(struct device_d *dev, const char *name,
int (*get)(struct param_d *p, void *priv),
IPaddr_t *ip, void *priv);
+#ifdef CONFIG_NET
struct param_d *dev_add_param_mac(struct device_d *dev, const char *name,
int (*set)(struct param_d *p, void *priv),
int (*get)(struct param_d *p, void *priv),
u8 *mac, void *priv);
+#endif
int dev_add_param_fixed(struct device_d *dev, const char *name, const char *value);
@@ -154,14 +156,6 @@ static inline struct param_d *dev_add_param_ip(struct device_d *dev, const char
return ERR_PTR(-ENOSYS);
}
-static inline struct param_d *dev_add_param_mac(struct device_d *dev, const char *name,
- int (*set)(struct param_d *p, void *priv),
- int (*get)(struct param_d *p, void *priv),
- u8 *mac, void *priv)
-{
- return ERR_PTR(-ENOSYS);
-}
-
static inline int dev_add_param_fixed(struct device_d *dev, const char *name, const char *value)
{
return 0;
@@ -178,4 +172,15 @@ static inline int dev_param_set_generic(struct device_d *dev, struct param_d *p,
}
#endif
+#if ! defined(CONFIG_PARAMETER) || ! defined(CONFIG_NET)
+static inline struct param_d *dev_add_param_mac(struct device_d *dev, const char *name,
+ int (*set)(struct param_d *p, void *priv),
+ int (*get)(struct param_d *p, void *priv),
+ u8 *mac, void *priv)
+{
+ return ERR_PTR(-ENOSYS);
+}
+
+#endif
+
#endif /* PARAM_H */
--
2.6.0
More information about the barebox
mailing list