| Message ID | 20240820074805.680674-1-ruanjinjie@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | e58c3f3d5196952ffa29dd987a15405b7f559af9 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [-next] net: dsa: ocelot: Simplify with scoped for each OF child loop | expand |
Hello: This patch was applied to netdev/net-next.git (main) by Jakub Kicinski <kuba@kernel.org>: On Tue, 20 Aug 2024 15:48:05 +0800 you wrote: > 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@huawei.com> > --- > drivers/net/dsa/ocelot/felix.c | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) Here is the summary with links: - [-next] net: dsa: ocelot: Simplify with scoped for each OF child loop https://git.kernel.org/netdev/net-next/c/e58c3f3d5196 You are awesome, thank you!
diff --git a/drivers/net/dsa/ocelot/felix.c b/drivers/net/dsa/ocelot/felix.c index e554699f06d4..800711c2b6cb 100644 --- a/drivers/net/dsa/ocelot/felix.c +++ b/drivers/net/dsa/ocelot/felix.c @@ -1265,9 +1265,8 @@ static int felix_parse_ports_node(struct felix *felix, phy_interface_t *port_phy_modes) { struct device *dev = felix->ocelot.dev; - struct device_node *child; - for_each_available_child_of_node(ports_node, child) { + for_each_available_child_of_node_scoped(ports_node, child) { phy_interface_t phy_mode; u32 port; int err; @@ -1276,7 +1275,6 @@ static int felix_parse_ports_node(struct felix *felix, if (of_property_read_u32(child, "reg", &port) < 0) { dev_err(dev, "Port number not defined in device tree " "(property \"reg\")\n"); - of_node_put(child); return -ENODEV; } @@ -1286,7 +1284,6 @@ static int felix_parse_ports_node(struct felix *felix, dev_err(dev, "Failed to read phy-mode or " "phy-interface-type property for port %d\n", port); - of_node_put(child); return -ENODEV; }
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@huawei.com> --- drivers/net/dsa/ocelot/felix.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)