hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

net: dsa: use of_for_each_phandle 

The OF code provides a of_for_each_phandle() helper to iterate over
phandles. Use it instead of arbitrary iterating ourselves over the list
of phandles hanging to the "link" property of the port's device node.

The of_phandle_iterator_next() helper calls of_node_put() itself on
it.node. Thus We must only do it ourselves if we break the loop.

Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Vivien Didelot 2017-11-06 16:11:50 -05:00 committed by David S. Miller
parent f163da8853
commit c528666555
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
net/dsa/dsa2.c
View File

@ -145,21 +145,18 @@ static int dsa_port_complete(struct dsa_switch_tree *dst,
struct dsa_port *port, struct dsa_port *port,
u32 src_port) u32 src_port)
{ {
struct device_node *link; struct device_node *dn = port->dn;
int index; struct of_phandle_iterator it;
struct dsa_switch *dst_ds; struct dsa_switch *dst_ds;
struct dsa_port *link_dp; struct dsa_port *link_dp;
int err;
for (index = 0;; index++) { of_for_each_phandle(&it, err, dn, "link", NULL, 0) {
link = of_parse_phandle(port->dn, "link", index); link_dp = dsa_tree_find_port_by_node(dst, it.node);
if (!link) if (!link_dp) {
break; of_node_put(it.node);
link_dp = dsa_tree_find_port_by_node(dst, link);
of_node_put(link);
if (!link_dp)
return 1; return 1;
}
dst_ds = link_dp->ds; dst_ds = link_dp->ds;