net: dsa: add find port by node helper

Instead of having two dsa_ds_find_port_dn (which returns a bool) and
dsa_dst_find_port_dn (which returns a switch) functions, provide a more
explicit dsa_tree_find_port_by_node function which returns a matching
port.

Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c
index 676c0bc943dd127707bed46c12f012d594cfe741..0f6f8c1701f9f2cadef4bf694b7c0c374d6cf266 100644 (file)
--- a/net/dsa/dsa2.c
+++ b/net/dsa/dsa2.c
@@ -117,30 +117,24 @@ static bool dsa_port_is_user(struct dsa_port *dp)
        return dp->type == DSA_PORT_TYPE_USER;
 }
 
-static bool dsa_ds_find_port_dn(struct dsa_switch *ds,
-                               struct device_node *port)
-{
-       u32 index;
-
-       for (index = 0; index < ds->num_ports; index++)
-               if (ds->ports[index].dn == port)
-                       return true;
-       return false;
-}
-
-static struct dsa_switch *dsa_dst_find_port_dn(struct dsa_switch_tree *dst,
-                                              struct device_node *port)
+static struct dsa_port *dsa_tree_find_port_by_node(struct dsa_switch_tree *dst,
+                                                  struct device_node *dn)
 {
        struct dsa_switch *ds;
-       u32 index;
+       struct dsa_port *dp;
+       int device, port;
 
-       for (index = 0; index < DSA_MAX_SWITCHES; index++) {
-               ds = dst->ds[index];
+       for (device = 0; device < DSA_MAX_SWITCHES; device++) {
+               ds = dst->ds[device];
                if (!ds)
                        continue;
 
-               if (dsa_ds_find_port_dn(ds, port))
-                       return ds;
+               for (port = 0; port < ds->num_ports; port++) {
+                       dp = &ds->ports[port];
+
+                       if (dp->dn == dn)
+                               return dp;
+               }
        }
 
        return NULL;
@@ -154,18 +148,21 @@ static int dsa_port_complete(struct dsa_switch_tree *dst,
        struct device_node *link;
        int index;
        struct dsa_switch *dst_ds;
+       struct dsa_port *link_dp;
 
        for (index = 0;; index++) {
                link = of_parse_phandle(port->dn, "link", index);
                if (!link)
                        break;
 
-               dst_ds = dsa_dst_find_port_dn(dst, link);
+               link_dp = dsa_tree_find_port_by_node(dst, link);
                of_node_put(link);
 
-               if (!dst_ds)
+               if (!link_dp)
                        return 1;
 
+               dst_ds = link_dp->ds;
+
                src_ds->rtable[dst_ds->index] = src_port;
        }