]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
net: dsa: ocelot: Simplify with scoped for each OF child loop
authorJinjie Ruan <ruanjinjie@huawei.com>
Tue, 20 Aug 2024 07:48:05 +0000 (15:48 +0800)
committerJakub Kicinski <kuba@kernel.org>
Thu, 22 Aug 2024 00:18:44 +0000 (17:18 -0700)
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>
Link: https://patch.msgid.link/20240820074805.680674-1-ruanjinjie@huawei.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/dsa/ocelot/felix.c

index e554699f06d4191208c498fac335f2dce98f4872..800711c2b6cbd2a8b6fdfe29d687e3e94630fb9f 100644 (file)
@@ -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;
                }