net: dsa: move rest of devlink setup/teardown to devlink.c

The code that needed further refactoring into dedicated functions in
dsa2.c was left aside. Move it now to devlink.c, and make dsa2.c stop
including net/devlink.h.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/dsa/devlink.c b/net/dsa/devlink.c
index eff440b2b3c53e3d679b221b0a879a9af56042a7..431bf52290a1cfd27d01e050ac017decab6457c7 100644 (file)
--- a/net/dsa/devlink.c
+++ b/net/dsa/devlink.c
@@ -167,7 +167,7 @@ dsa_devlink_sb_occ_tc_port_bind_get(struct devlink_port *dlp,
                                                        p_max);
 }
 
-const struct devlink_ops dsa_devlink_ops = {
+static const struct devlink_ops dsa_devlink_ops = {
        .info_get                       = dsa_devlink_info_get,
        .sb_pool_get                    = dsa_devlink_sb_pool_get,
        .sb_pool_set                    = dsa_devlink_sb_pool_set,
@@ -353,3 +353,39 @@ void dsa_port_devlink_teardown(struct dsa_port *dp)
 
        devlink_port_fini(dlp);
 }
+
+void dsa_switch_devlink_register(struct dsa_switch *ds)
+{
+       devlink_register(ds->devlink);
+}
+
+void dsa_switch_devlink_unregister(struct dsa_switch *ds)
+{
+       devlink_unregister(ds->devlink);
+}
+
+int dsa_switch_devlink_alloc(struct dsa_switch *ds)
+{
+       struct dsa_devlink_priv *dl_priv;
+       struct devlink *dl;
+
+       /* Add the switch to devlink before calling setup, so that setup can
+        * add dpipe tables
+        */
+       dl = devlink_alloc(&dsa_devlink_ops, sizeof(*dl_priv), ds->dev);
+       if (!dl)
+               return -ENOMEM;
+
+       ds->devlink = dl;
+
+       dl_priv = devlink_priv(ds->devlink);
+       dl_priv->ds = ds;
+
+       return 0;
+}
+
+void dsa_switch_devlink_free(struct dsa_switch *ds)
+{
+       devlink_free(ds->devlink);
+       ds->devlink = NULL;
+}

diff --git a/net/dsa/devlink.h b/net/dsa/devlink.h
index d077c7f336dace792bb835551443448694b0e798..4d9f4f23705bd7e6475cdcaac5853d3bd1fe248d 100644 (file)
--- a/net/dsa/devlink.h
+++ b/net/dsa/devlink.h
@@ -4,10 +4,13 @@
 #define __DSA_DEVLINK_H
 
 struct dsa_port;
-
-extern const struct devlink_ops dsa_devlink_ops;
+struct dsa_switch;
 
 int dsa_port_devlink_setup(struct dsa_port *dp);
 void dsa_port_devlink_teardown(struct dsa_port *dp);
+void dsa_switch_devlink_register(struct dsa_switch *ds);
+void dsa_switch_devlink_unregister(struct dsa_switch *ds);
+int dsa_switch_devlink_alloc(struct dsa_switch *ds);
+void dsa_switch_devlink_free(struct dsa_switch *ds);
 
 #endif

diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c
index f890dfcbf412d5671dbc076c5a4fc4464be37dd5..c0ef49d863812efcafd1d3f30a8742cbc6ecb7c9 100644 (file)
--- a/net/dsa/dsa2.c
+++ b/net/dsa/dsa2.c
@@ -15,7 +15,6 @@
 #include <linux/of.h>
 #include <linux/of_mdio.h>
 #include <linux/of_net.h>
-#include <net/devlink.h>
 #include <net/sch_generic.h>
 
 #include "devlink.h"
@@ -627,7 +626,6 @@ static void dsa_switch_teardown_tag_protocol(struct dsa_switch *ds)
 
 static int dsa_switch_setup(struct dsa_switch *ds)
 {
-       struct dsa_devlink_priv *dl_priv;
        struct device_node *dn;
        int err;
 
@@ -641,15 +639,9 @@ static int dsa_switch_setup(struct dsa_switch *ds)
         */
        ds->phys_mii_mask |= dsa_user_ports(ds);
 
-       /* Add the switch to devlink before calling setup, so that setup can
-        * add dpipe tables
-        */
-       ds->devlink =
-               devlink_alloc(&dsa_devlink_ops, sizeof(*dl_priv), ds->dev);
-       if (!ds->devlink)
-               return -ENOMEM;
-       dl_priv = devlink_priv(ds->devlink);
-       dl_priv->ds = ds;
+       err = dsa_switch_devlink_alloc(ds);
+       if (err)
+               return err;
 
        err = dsa_switch_register_notifier(ds);
        if (err)
@@ -682,7 +674,7 @@ static int dsa_switch_setup(struct dsa_switch *ds)
                        goto free_slave_mii_bus;
        }
 
-       devlink_register(ds->devlink);
+       dsa_switch_devlink_register(ds);
 
        ds->setup = true;
        return 0;
@@ -696,8 +688,7 @@ teardown:
 unregister_notifier:
        dsa_switch_unregister_notifier(ds);
 devlink_free:
-       devlink_free(ds->devlink);
-       ds->devlink = NULL;
+       dsa_switch_devlink_free(ds);
        return err;
 }
 
@@ -706,7 +697,7 @@ static void dsa_switch_teardown(struct dsa_switch *ds)
        if (!ds->setup)
                return;
 
-       devlink_unregister(ds->devlink);
+       dsa_switch_devlink_unregister(ds);
 
        if (ds->slave_mii_bus && ds->ops->phy_read) {
                mdiobus_unregister(ds->slave_mii_bus);
@@ -721,8 +712,7 @@ static void dsa_switch_teardown(struct dsa_switch *ds)
 
        dsa_switch_unregister_notifier(ds);
 
-       devlink_free(ds->devlink);
-       ds->devlink = NULL;
+       dsa_switch_devlink_free(ds);
 
        ds->setup = false;
 }