net: bcmasp: Simplify with scoped for each OF child loop

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

Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
Reviewed-by: Justin Chen <justin.chen@broadcom.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Jinjie Ruan <ruanjinjie@huawei.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/ethernet/broadcom/asp2/bcmasp.c b/drivers/net/ethernet/broadcom/asp2/bcmasp.c
index 20c6529ec1350e29945b1d06d82a80aaafb49caa..297c2682a9cf979fbc4af211139f1b1ed0df01d5 100644 (file)
--- a/drivers/net/ethernet/broadcom/asp2/bcmasp.c
+++ b/drivers/net/ethernet/broadcom/asp2/bcmasp.c
@@ -1300,9 +1300,9 @@ static void bcmasp_remove_intfs(struct bcmasp_priv *priv)
 
 static int bcmasp_probe(struct platform_device *pdev)
 {
-       struct device_node *ports_node, *intf_node;
        const struct bcmasp_plat_data *pdata;
        struct device *dev = &pdev->dev;
+       struct device_node *ports_node;
        struct bcmasp_priv *priv;
        struct bcmasp_intf *intf;
        int ret = 0, count = 0;
@@ -1374,12 +1374,11 @@ static int bcmasp_probe(struct platform_device *pdev)
        }
 
        i = 0;
-       for_each_available_child_of_node(ports_node, intf_node) {
+       for_each_available_child_of_node_scoped(ports_node, intf_node) {
                intf = bcmasp_interface_create(priv, intf_node, i);
                if (!intf) {
                        dev_err(dev, "Cannot create eth interface %d\n", i);
                        bcmasp_remove_intfs(priv);
-                       of_node_put(intf_node);
                        ret = -ENOMEM;
                        goto of_put_exit;
                }