net: dsa: rename dsa_port_link_{,un}register_of

There is a subset of functions that applies only to shared (DSA and CPU)
ports, yet this is difficult to comprehend by looking at their code alone.
These are dsa_port_link_register_of(), dsa_port_link_unregister_of(),
and the functions that only these 2 call.

Rename this class of functions to dsa_shared_port_* to make this fact
more evident, even if this goes against the apparent convention that
function names in port.c must start with dsa_port_.

Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c
index 12479707bf96f8adb2f0f91bc727b3f75b738d8d..055a6d1d43727413ebfaf483f0f82d49c876caf9 100644 (file)
--- a/net/dsa/dsa2.c
+++ b/net/dsa/dsa2.c
@@ -470,7 +470,7 @@ static int dsa_port_setup(struct dsa_port *dp)
                break;
        case DSA_PORT_TYPE_CPU:
                if (dp->dn) {
-                       err = dsa_port_link_register_of(dp);
+                       err = dsa_shared_port_link_register_of(dp);
                        if (err)
                                break;
                        dsa_port_link_registered = true;
@@ -488,7 +488,7 @@ static int dsa_port_setup(struct dsa_port *dp)
                break;
        case DSA_PORT_TYPE_DSA:
                if (dp->dn) {
-                       err = dsa_port_link_register_of(dp);
+                       err = dsa_shared_port_link_register_of(dp);
                        if (err)
                                break;
                        dsa_port_link_registered = true;
@@ -517,7 +517,7 @@ static int dsa_port_setup(struct dsa_port *dp)
        if (err && dsa_port_enabled)
                dsa_port_disable(dp);
        if (err && dsa_port_link_registered)
-               dsa_port_link_unregister_of(dp);
+               dsa_shared_port_link_unregister_of(dp);
        if (err) {
                if (ds->ops->port_teardown)
                        ds->ops->port_teardown(ds, dp->index);
@@ -590,12 +590,12 @@ static void dsa_port_teardown(struct dsa_port *dp)
        case DSA_PORT_TYPE_CPU:
                dsa_port_disable(dp);
                if (dp->dn)
-                       dsa_port_link_unregister_of(dp);
+                       dsa_shared_port_link_unregister_of(dp);
                break;
        case DSA_PORT_TYPE_DSA:
                dsa_port_disable(dp);
                if (dp->dn)
-                       dsa_port_link_unregister_of(dp);
+                       dsa_shared_port_link_unregister_of(dp);
                break;
        case DSA_PORT_TYPE_USER:
                if (dp->slave) {

diff --git a/net/dsa/dsa_priv.h b/net/dsa/dsa_priv.h
index d9722e49864b06176fa781706e3f76c57f3bff3e..8924366467e094b55c323c80311d8a228e20689c 100644 (file)
--- a/net/dsa/dsa_priv.h
+++ b/net/dsa/dsa_priv.h
@@ -285,8 +285,8 @@ int dsa_port_mrp_add_ring_role(const struct dsa_port *dp,
 int dsa_port_mrp_del_ring_role(const struct dsa_port *dp,
                               const struct switchdev_obj_ring_role_mrp *mrp);
 int dsa_port_phylink_create(struct dsa_port *dp);
-int dsa_port_link_register_of(struct dsa_port *dp);
-void dsa_port_link_unregister_of(struct dsa_port *dp);
+int dsa_shared_port_link_register_of(struct dsa_port *dp);
+void dsa_shared_port_link_unregister_of(struct dsa_port *dp);
 int dsa_port_hsr_join(struct dsa_port *dp, struct net_device *hsr);
 void dsa_port_hsr_leave(struct dsa_port *dp, struct net_device *hsr);
 int dsa_port_tag_8021q_vlan_add(struct dsa_port *dp, u16 vid, bool broadcast);

diff --git a/net/dsa/port.c b/net/dsa/port.c
index a8895ee3cd600ca8cfd1cc88a6614a910cc76b7f..bd0cb38a63f69aa89fbfd7766d960f0c39f11ba0 100644 (file)
--- a/net/dsa/port.c
+++ b/net/dsa/port.c
@@ -1555,7 +1555,7 @@ int dsa_port_phylink_create(struct dsa_port *dp)
        return 0;
 }
 
-static int dsa_port_setup_phy_of(struct dsa_port *dp, bool enable)
+static int dsa_shared_port_setup_phy_of(struct dsa_port *dp, bool enable)
 {
        struct dsa_switch *ds = dp->ds;
        struct phy_device *phydev;
@@ -1593,7 +1593,7 @@ err_put_dev:
        return err;
 }
 
-static int dsa_port_fixed_link_register_of(struct dsa_port *dp)
+static int dsa_shared_port_fixed_link_register_of(struct dsa_port *dp)
 {
        struct device_node *dn = dp->dn;
        struct dsa_switch *ds = dp->ds;
@@ -1627,7 +1627,7 @@ static int dsa_port_fixed_link_register_of(struct dsa_port *dp)
        return 0;
 }
 
-static int dsa_port_phylink_register(struct dsa_port *dp)
+static int dsa_shared_port_phylink_register(struct dsa_port *dp)
 {
        struct dsa_switch *ds = dp->ds;
        struct device_node *port_dn = dp->dn;
@@ -1653,7 +1653,7 @@ err_phy_connect:
        return err;
 }
 
-int dsa_port_link_register_of(struct dsa_port *dp)
+int dsa_shared_port_link_register_of(struct dsa_port *dp)
 {
        struct dsa_switch *ds = dp->ds;
        struct device_node *phy_np;
@@ -1666,7 +1666,7 @@ int dsa_port_link_register_of(struct dsa_port *dp)
                                ds->ops->phylink_mac_link_down(ds, port,
                                        MLO_AN_FIXED, PHY_INTERFACE_MODE_NA);
                        of_node_put(phy_np);
-                       return dsa_port_phylink_register(dp);
+                       return dsa_shared_port_phylink_register(dp);
                }
                of_node_put(phy_np);
                return 0;
@@ -1676,12 +1676,12 @@ int dsa_port_link_register_of(struct dsa_port *dp)
                 "Using legacy PHYLIB callbacks. Please migrate to PHYLINK!\n");
 
        if (of_phy_is_fixed_link(dp->dn))
-               return dsa_port_fixed_link_register_of(dp);
+               return dsa_shared_port_fixed_link_register_of(dp);
        else
-               return dsa_port_setup_phy_of(dp, true);
+               return dsa_shared_port_setup_phy_of(dp, true);
 }
 
-void dsa_port_link_unregister_of(struct dsa_port *dp)
+void dsa_shared_port_link_unregister_of(struct dsa_port *dp)
 {
        struct dsa_switch *ds = dp->ds;
 
@@ -1697,7 +1697,7 @@ void dsa_port_link_unregister_of(struct dsa_port *dp)
        if (of_phy_is_fixed_link(dp->dn))
                of_phy_deregister_fixed_link(dp->dn);
        else
-               dsa_port_setup_phy_of(dp, false);
+               dsa_shared_port_setup_phy_of(dp, false);
 }
 
 int dsa_port_hsr_join(struct dsa_port *dp, struct net_device *hsr)