[PATCH net-next v2 1/7] net: dsa: Add helper to convert from devlink to ds

[Andrew Lunn]

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

Reviewed-by: Florian Fainelli <f.faine...@gmail.com>
Signed-off-by: Andrew Lunn <and...@lunn.ch>
---
 include/net/dsa.h |  2 ++
 net/dsa/dsa.c     | 20 ++++++++++----------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/include/net/dsa.h b/include/net/dsa.h
index 75c8fac82017..63ff6f717307 100644
--- a/include/net/dsa.h
+++ b/include/net/dsa.h
@@ -629,6 +629,8 @@ struct dsa_switch_ops {
        int     (*port_max_mtu)(struct dsa_switch *ds, int port);
 };
 
+struct dsa_switch *dsa_devlink_to_ds(struct devlink *dl);
+
 #define DSA_DEVLINK_PARAM_DRIVER(_id, _name, _type, _cmodes)           \
        DEVLINK_PARAM_DRIVER(_id, _name, _type, _cmodes,                \
                             dsa_devlink_param_get, dsa_devlink_param_set, NULL)
diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
index 1ce9ba8cf545..86351da4e202 100644
--- a/net/dsa/dsa.c
+++ b/net/dsa/dsa.c
@@ -327,14 +327,18 @@ int call_dsa_notifiers(unsigned long val, struct 
net_device *dev,
 }
 EXPORT_SYMBOL_GPL(call_dsa_notifiers);
 
+struct dsa_switch *dsa_devlink_to_ds(struct devlink *dl)
+{
+       struct dsa_devlink_priv *dl_priv = devlink_priv(dl);
+
+       return dl_priv->ds;
+}
+EXPORT_SYMBOL_GPL(dsa_devlink_to_ds);
+
 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 +350,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;
-- 
2.28.0