thermal: of: Simplify thermal_of_should_bind with scoped for each OF child

[ Upstream commit 69f3aa6ad92447d6e9f50c5b5aea85b56e80b198 ]

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>
Link: https://patch.msgid.link/20241010-b4-cleanup-h-of-node-put-thermal-v4-1-bfbe29ad81f4@linaro.org
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Stable-dep-of: 423de5b5bc5b ("thermal/of: Fix cdev lookup in thermal_of_should_bind()")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/thermal/thermal_of.c b/drivers/thermal/thermal_of.c
index 5d3d8ce672cd510771af66050ac4acc406c1edd3..111d2c15601b98cabfe71449c91e11f9ab848786 100644 (file)
--- a/drivers/thermal/thermal_of.c
+++ b/drivers/thermal/thermal_of.c
@@ -298,7 +298,7 @@ static bool thermal_of_should_bind(struct thermal_zone_device *tz,
                                   struct thermal_cooling_device *cdev,
                                   struct cooling_spec *c)
 {
-       struct device_node *tz_np, *cm_np, *child;
+       struct device_node *tz_np, *cm_np;
        bool result = false;
 
        tz_np = thermal_of_zone_get_by_name(tz);
@@ -312,7 +312,7 @@ static bool thermal_of_should_bind(struct thermal_zone_device *tz,
                goto out;
 
        /* Look up the trip and the cdev in the cooling maps. */
-       for_each_child_of_node(cm_np, child) {
+       for_each_child_of_node_scoped(cm_np, child) {
                struct device_node *tr_np;
                int count, i;
 
@@ -331,7 +331,6 @@ static bool thermal_of_should_bind(struct thermal_zone_device *tz,
                                break;
                }
 
-               of_node_put(child);
                break;
        }