Commit 65c563a6 authored by Vladimir Oltean's avatar Vladimir Oltean Committed by David S. Miller
Browse files

net: dsa: do not open-code dsa_switch_for_each_port 



Find the remaining iterators over dst->ports that only filter for the
ports belonging to a certain switch, and replace those with the
dsa_switch_for_each_port helper that we have now.

Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d0004a02

net/dsa/dsa2.c

+14 −30
Original line number Diff line number Diff line
@@ -399,11 +399,8 @@ static int dsa_tree_setup_cpu_ports(struct dsa_switch_tree *dst) 
		if (!dsa_port_is_cpu(cpu_dp))

			continue;



		list_for_each_entry(dp, &dst->ports, list) {

		/* Prefer a local CPU port */

			if (dp->ds != cpu_dp->ds)

				continue;



		dsa_switch_for_each_port(dp, cpu_dp->ds) {

			/* Prefer the first local CPU port found */

			if (dp->cpu_dp)

				continue;
@@ -852,13 +849,11 @@ static int dsa_switch_setup(struct dsa_switch *ds) 
	/* Setup devlink port instances now, so that the switch

	 * setup() can register regions etc, against the ports

	 */

	list_for_each_entry(dp, &ds->dst->ports, list) {

		if (dp->ds == ds) {

	dsa_switch_for_each_port(dp, ds) {

		err = dsa_port_devlink_setup(dp);

		if (err)

			goto unregister_devlink_ports;

	}

	}



	err = dsa_switch_register_notifier(ds);

	if (err)
@@ -901,8 +896,7 @@ static int dsa_switch_setup(struct dsa_switch *ds) 
unregister_notifier:

	dsa_switch_unregister_notifier(ds);

unregister_devlink_ports:

	list_for_each_entry(dp, &ds->dst->ports, list)

		if (dp->ds == ds)

	dsa_switch_for_each_port(dp, ds)

		dsa_port_devlink_teardown(dp);

	devlink_free(ds->devlink);

	ds->devlink = NULL;
@@ -931,8 +925,7 @@ static void dsa_switch_teardown(struct dsa_switch *ds) 
	dsa_switch_unregister_notifier(ds);



	if (ds->devlink) {

		list_for_each_entry(dp, &ds->dst->ports, list)

			if (dp->ds == ds)

		dsa_switch_for_each_port(dp, ds)

			dsa_port_devlink_teardown(dp);

		devlink_free(ds->devlink);

		ds->devlink = NULL;
@@ -1180,8 +1173,8 @@ static struct dsa_port *dsa_port_touch(struct dsa_switch *ds, int index) 
	struct dsa_switch_tree *dst = ds->dst;

	struct dsa_port *dp;



	list_for_each_entry(dp, &dst->ports, list)

		if (dp->ds == ds && dp->index == index)

	dsa_switch_for_each_port(dp, ds)

		if (dp->index == index)

			return dp;



	dp = kzalloc(sizeof(*dp), GFP_KERNEL);
@@ -1522,12 +1515,9 @@ static int dsa_switch_parse(struct dsa_switch *ds, struct dsa_chip_data *cd) 


static void dsa_switch_release_ports(struct dsa_switch *ds)

{

	struct dsa_switch_tree *dst = ds->dst;

	struct dsa_port *dp, *next;



	list_for_each_entry_safe(dp, next, &dst->ports, list) {

		if (dp->ds != ds)

			continue;

	dsa_switch_for_each_port_safe(dp, next, ds) {

		list_del(&dp->list);

		kfree(dp);

	}
@@ -1619,13 +1609,7 @@ void dsa_switch_shutdown(struct dsa_switch *ds) 
	mutex_lock(&dsa2_mutex);

	rtnl_lock();



	list_for_each_entry(dp, &ds->dst->ports, list) {

		if (dp->ds != ds)

			continue;



		if (!dsa_port_is_user(dp))

			continue;



	dsa_switch_for_each_user_port(dp, ds) {

		master = dp->cpu_dp->master;

		slave_dev = dp->slave;