pmdomain: imx: gpcv2: Simplify with scoped for each OF child loop
BugLink: https://bugs.launchpad.net/bugs/2106770 [ Upstream commit 13bd778c900537f3fff7cfb671ff2eb0e92feee6 ] 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> Stable-dep-of: 469c0682e03d ("pmdomain: imx: gpcv2: fix an OF node reference leak in imx_gpcv2_probe()") Signed-off-by: Sasha Levin <sashal@kernel.org> Signed-off-by: Manuel Diewald <manuel.diewald@canonical.com> Signed-off-by: Mehmet Basaran <mehmet.basaran@canonical.com>
This commit is contained in:
committed by
Mehmet Basaran
parent
74226c872c
commit
42f8dfa3a6
@@ -1447,7 +1447,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;
|
||||
@@ -1469,7 +1469,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;
|
||||
@@ -1480,7 +1480,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;
|
||||
}
|
||||
|
||||
@@ -1495,7 +1494,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;
|
||||
}
|
||||
|
||||
@@ -1504,7 +1502,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;
|
||||
}
|
||||
|
||||
@@ -1521,7 +1518,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;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user