diff mbox series

[v2,2/2] cpuidle: riscv-sbi: Simplify with scoped for each OF child loop

Message ID 20240820094023.61155-2-krzysztof.kozlowski@linaro.org (mailing list archive)
State Mainlined, archived
Headers show
Series [v2,1/2] cpuidle: riscv-sbi: Use scoped device node handling to fix missing of_node_put | expand

Commit Message

Krzysztof Kozlowski Aug. 20, 2024, 9:40 a.m. UTC 
Use scoped for_each_child_of_node_scoped() when iterating over device
nodes to make code a bit simpler.

Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

---

Changes in v2:
1. None, only Rb tag.

Other patches from the set were applied.
---
 drivers/cpuidle/cpuidle-riscv-sbi.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

Comments

Anup Patel Aug. 20, 2024, 10:59 a.m. UTC | #1 
On Tue, Aug 20, 2024 at 3:10 PM Krzysztof Kozlowski
<krzysztof.kozlowski@linaro.org> wrote:
>
> Use scoped for_each_child_of_node_scoped() when iterating over device
> nodes to make code a bit simpler.
>
> Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

LGTM.

Reviewed-by: Anup Patel <anup@brainfault.org>

Regards,
Anup

>
> ---
>
> Changes in v2:
> 1. None, only Rb tag.
>
> Other patches from the set were applied.
> ---
>  drivers/cpuidle/cpuidle-riscv-sbi.c | 7 ++-----
>  1 file changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/cpuidle/cpuidle-riscv-sbi.c b/drivers/cpuidle/cpuidle-riscv-sbi.c
> index 5bb3401220d2..d228b4d18d56 100644
> --- a/drivers/cpuidle/cpuidle-riscv-sbi.c
> +++ b/drivers/cpuidle/cpuidle-riscv-sbi.c
> @@ -448,7 +448,6 @@ static void sbi_pd_remove(void)
>
>  static int sbi_genpd_probe(struct device_node *np)
>  {
> -       struct device_node *node;
>         int ret = 0, pd_count = 0;
>
>         if (!np)
> @@ -458,13 +457,13 @@ static int sbi_genpd_probe(struct device_node *np)
>          * Parse child nodes for the "#power-domain-cells" property and
>          * initialize a genpd/genpd-of-provider pair when it's found.
>          */
> -       for_each_child_of_node(np, node) {
> +       for_each_child_of_node_scoped(np, node) {
>                 if (!of_property_present(node, "#power-domain-cells"))
>                         continue;
>
>                 ret = sbi_pd_init(node);
>                 if (ret)
> -                       goto put_node;
> +                       goto remove_pd;
>
>                 pd_count++;
>         }
> @@ -480,8 +479,6 @@ static int sbi_genpd_probe(struct device_node *np)
>
>         return 0;
>
> -put_node:
> -       of_node_put(node);
>  remove_pd:
>         sbi_pd_remove();
>         pr_err("failed to create CPU PM domains ret=%d\n", ret);
> --
> 2.43.0
>
diff mbox series

Patch

diff --git a/drivers/cpuidle/cpuidle-riscv-sbi.c b/drivers/cpuidle/cpuidle-riscv-sbi.c
index 5bb3401220d2..d228b4d18d56 100644
--- a/drivers/cpuidle/cpuidle-riscv-sbi.c
+++ b/drivers/cpuidle/cpuidle-riscv-sbi.c
@@ -448,7 +448,6 @@  static void sbi_pd_remove(void)
 
 static int sbi_genpd_probe(struct device_node *np)
 {
-	struct device_node *node;
 	int ret = 0, pd_count = 0;
 
 	if (!np)
@@ -458,13 +457,13 @@  static int sbi_genpd_probe(struct device_node *np)
 	 * Parse child nodes for the "#power-domain-cells" property and
 	 * initialize a genpd/genpd-of-provider pair when it's found.
 	 */
-	for_each_child_of_node(np, node) {
+	for_each_child_of_node_scoped(np, node) {
 		if (!of_property_present(node, "#power-domain-cells"))
 			continue;
 
 		ret = sbi_pd_init(node);
 		if (ret)
-			goto put_node;
+			goto remove_pd;
 
 		pd_count++;
 	}
@@ -480,8 +479,6 @@  static int sbi_genpd_probe(struct device_node *np)
 
 	return 0;
 
-put_node:
-	of_node_put(node);
 remove_pd:
 	sbi_pd_remove();
 	pr_err("failed to create CPU PM domains ret=%d\n", ret);