[PATCH -next] net: dsa: Simplify with scoped for each OF child loop

From: Jinjie Ruan
Date: Tue Aug 20 2024 - 02:50:57 EST


Use scoped for_each_available_child_of_node_scoped() when iterating over
device nodes to make code a bit simpler.

Signed-off-by: Jinjie Ruan <ruanjinjie@xxxxxxxxxx>
---
net/dsa/dsa.c | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c
index 668c729946ea..77d91cbb0686 100644
--- a/net/dsa/dsa.c
+++ b/net/dsa/dsa.c
@@ -1264,7 +1264,7 @@ static int dsa_port_parse_of(struct dsa_port *dp, struct device_node *dn)
static int dsa_switch_parse_ports_of(struct dsa_switch *ds,
struct device_node *dn)
{
- struct device_node *ports, *port;
+ struct device_node *ports;
struct dsa_port *dp;
int err = 0;
u32 reg;
@@ -1279,17 +1279,14 @@ static int dsa_switch_parse_ports_of(struct dsa_switch *ds,
}
}

- for_each_available_child_of_node(ports, port) {
+ for_each_available_child_of_node_scoped(ports, port) {
err = of_property_read_u32(port, "reg", &reg);
- if (err) {
- of_node_put(port);
+ if (err)
goto out_put_node;
- }

if (reg >= ds->num_ports) {
dev_err(ds->dev, "port %pOF index %u exceeds num_ports (%u)\n",
port, reg, ds->num_ports);
- of_node_put(port);
err = -EINVAL;
goto out_put_node;
}
@@ -1297,10 +1294,8 @@ static int dsa_switch_parse_ports_of(struct dsa_switch *ds,
dp = dsa_to_port(ds, reg);

err = dsa_port_parse_of(dp, port);
- if (err) {
- of_node_put(port);
+ if (err)
goto out_put_node;
- }
}

out_put_node:
--
2.34.1