Commit 770375ff authored by Vladimir Oltean's avatar Vladimir Oltean Committed by Jakub Kicinski
Browse files

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: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent da2c398e

net/dsa/dsa2.c

+5 −5
Original line number Diff line number Diff line
@@ -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) {

net/dsa/dsa_priv.h

+2 −2
Original line number Diff line number Diff line
@@ -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);

net/dsa/port.c

+9 −9
Original line number Diff line number Diff line
@@ -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 @@ static int dsa_port_setup_phy_of(struct dsa_port *dp, bool enable) 
	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 @@ static int dsa_port_phylink_register(struct dsa_port *dp) 
	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)