net: dsa: Add helper to convert from devlink to ds

Given a devlink instance, return the dsa switch it is associated to.

Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/dsa.h b/include/net/dsa.h
index 75c8fac820174442c549c4caa50b535fbc5e6eef..42ae6d4d9d43f1842e5c04afd4564318796faee1 100644 (file)
--- a/include/net/dsa.h
+++ b/include/net/dsa.h
@@ -664,6 +664,13 @@ struct dsa_devlink_priv {
        struct dsa_switch *ds;
 };
 
+static inline struct dsa_switch *dsa_devlink_to_ds(struct devlink *dl)
+{
+       struct dsa_devlink_priv *dl_priv = devlink_priv(dl);
+
+       return dl_priv->ds;
+}
+
 struct dsa_switch_driver {
        struct list_head        list;
        const struct dsa_switch_ops *ops;

diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
index 1ce9ba8cf5453831ca6a085d972c0709a7cc62d4..9b7019d86165c2ba49f7ef6411aab222ec13c91a 100644 (file)
--- a/net/dsa/dsa.c
+++ b/net/dsa/dsa.c
@@ -330,11 +330,7 @@ EXPORT_SYMBOL_GPL(call_dsa_notifiers);
 int dsa_devlink_param_get(struct devlink *dl, u32 id,
                          struct devlink_param_gset_ctx *ctx)
 {
-       struct dsa_devlink_priv *dl_priv;
-       struct dsa_switch *ds;
-
-       dl_priv = devlink_priv(dl);
-       ds = dl_priv->ds;
+       struct dsa_switch *ds = dsa_devlink_to_ds(dl);
 
        if (!ds->ops->devlink_param_get)
                return -EOPNOTSUPP;
@@ -346,11 +342,7 @@ EXPORT_SYMBOL_GPL(dsa_devlink_param_get);
 int dsa_devlink_param_set(struct devlink *dl, u32 id,
                          struct devlink_param_gset_ctx *ctx)
 {
-       struct dsa_devlink_priv *dl_priv;
-       struct dsa_switch *ds;
-
-       dl_priv = devlink_priv(dl);
-       ds = dl_priv->ds;
+       struct dsa_switch *ds = dsa_devlink_to_ds(dl);
 
        if (!ds->ops->devlink_param_set)
                return -EOPNOTSUPP;