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: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c
index 1c09182..2a339fb 100644 (file)
--- a/net/dsa/dsa2.c
+++ b/net/dsa/dsa2.c
@@ -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;
-
+               /* Prefer a local CPU port */
+               dsa_switch_for_each_port(dp, cpu_dp->ds) {
                        /* Prefer the first local CPU port found */
                        if (dp->cpu_dp)
                                continue;
@@ -852,12 +849,10 @@ 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) {
-                       err = dsa_port_devlink_setup(dp);
-                       if (err)
-                               goto unregister_devlink_ports;
-               }
+       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);
@@ -901,9 +896,8 @@ teardown:
 unregister_notifier:
        dsa_switch_unregister_notifier(ds);
 unregister_devlink_ports:
-       list_for_each_entry(dp, &ds->dst->ports, list)
-               if (dp->ds == ds)
-                       dsa_port_devlink_teardown(dp);
+       dsa_switch_for_each_port(dp, ds)
+               dsa_port_devlink_teardown(dp);
        devlink_free(ds->devlink);
        ds->devlink = NULL;
        return err;
@@ -931,9 +925,8 @@ 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_port_devlink_teardown(dp);
+               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;