]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
cpuidle: riscv-sbi: Simplify with scoped for each OF child loop
authorKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Tue, 20 Aug 2024 09:40:23 +0000 (11:40 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 20 Aug 2024 19:46:43 +0000 (21:46 +0200)
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>
Reviewed-by: Anup Patel <anup@brainfault.org>
Link: https://patch.msgid.link/20240820094023.61155-2-krzysztof.kozlowski@linaro.org
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/cpuidle/cpuidle-riscv-sbi.c

index 5bb3401220d296e0ad341f77ec682e71516dde7a..d228b4d18d56005a53ec6230e91f1cf65e47ecdd 100644 (file)
@@ -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);