Re: [PATCH 4/7] thermal: of: Simplify thermal_of_for_each_cooling_maps() with scoped for each OF child loop

Chen-Yu Tsai
2024-08-15T07:22:35Z

On Wed, Aug 14, 2024 at 10:17:50PM +0200, Krzysztof Kozlowski wrote:
> 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>

Reviewed-by: Chen-Yu Tsai <wenst@chromium.org>

> ---
> drivers/thermal/thermal_of.c | 8 +++-----
> 1 file changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/thermal/thermal_of.c b/drivers/thermal/thermal_of.c
> index fb5472d6ffea..d277165746d5 100644
> --- a/drivers/thermal/thermal_of.c
> +++ b/drivers/thermal/thermal_of.c
> @@ -375,7 +375,7 @@ static int thermal_of_for_each_cooling_maps(struct thermal_zone_device *tz,
> int (*action)(struct device_node *, int, int,
> struct thermal_zone_device *, struct thermal_cooling_device *))
> {
> - struct device_node *tz_np, *cm_np, *child;
> + struct device_node *tz_np, *cm_np;

Looks like the remaining two pointers are also candidates for cleanup?

> int ret = 0;
>
> tz_np = thermal_of_zone_get_by_name(tz);
> @@ -388,12 +388,10 @@ static int thermal_of_for_each_cooling_maps(struct thermal_zone_device *tz,
> if (!cm_np)
> goto out;
>
> - for_each_child_of_node(cm_np, child) {
> + for_each_child_of_node_scoped(cm_np, child) {
> ret = thermal_of_for_each_cooling_device(tz_np, child, tz, cdev, action);
> - if (ret) {
> - of_node_put(child);
> + if (ret)
> break;
> - }
> }
>
> of_node_put(cm_np);
>
> --
> 2.43.0
>