pmdomain: imx: gpcv2: Simplify with scoped for each OF child loop

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

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20240823-cleanup-h-guard-pm-domain-v1-4-8320722eaf39@linaro.org
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/drivers/pmdomain/imx/gpcv2.c b/drivers/pmdomain/imx/gpcv2.c
index 856eaac0ec140d9668a814dbf84b8e649cb26abf..963d61c5af6d5e409850b9da1141ce0f32b5d58d 100644 (file)
--- a/drivers/pmdomain/imx/gpcv2.c
+++ b/drivers/pmdomain/imx/gpcv2.c
@@ -1458,7 +1458,7 @@ static int imx_gpcv2_probe(struct platform_device *pdev)
                .max_register   = SZ_4K,
        };
        struct device *dev = &pdev->dev;
-       struct device_node *pgc_np, *np;
+       struct device_node *pgc_np;
        struct regmap *regmap;
        void __iomem *base;
        int ret;
@@ -1480,7 +1480,7 @@ static int imx_gpcv2_probe(struct platform_device *pdev)
                return ret;
        }
 
-       for_each_child_of_node(pgc_np, np) {
+       for_each_child_of_node_scoped(pgc_np, np) {
                struct platform_device *pd_pdev;
                struct imx_pgc_domain *domain;
                u32 domain_index;
@@ -1491,7 +1491,6 @@ static int imx_gpcv2_probe(struct platform_device *pdev)
                ret = of_property_read_u32(np, "reg", &domain_index);
                if (ret) {
                        dev_err(dev, "Failed to read 'reg' property\n");
-                       of_node_put(np);
                        return ret;
                }
 
@@ -1506,7 +1505,6 @@ static int imx_gpcv2_probe(struct platform_device *pdev)
                                                domain_index);
                if (!pd_pdev) {
                        dev_err(dev, "Failed to allocate platform device\n");
-                       of_node_put(np);
                        return -ENOMEM;
                }
 
@@ -1515,7 +1513,6 @@ static int imx_gpcv2_probe(struct platform_device *pdev)
                                               sizeof(domain_data->domains[domain_index]));
                if (ret) {
                        platform_device_put(pd_pdev);
-                       of_node_put(np);
                        return ret;
                }
 
@@ -1532,7 +1529,6 @@ static int imx_gpcv2_probe(struct platform_device *pdev)
                ret = platform_device_add(pd_pdev);
                if (ret) {
                        platform_device_put(pd_pdev);
-                       of_node_put(np);
                        return ret;
                }
        }