| Message ID | 20240816-b4-cleanup-h-of-node-put-thermal-v2-0-cee9fc490478@linaro.org |
|---|---|
| Headers | show |
| Series | thermal: scope/cleanup.h improvements | expand |
On Fri, Aug 16, 2024 at 9:40 AM 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: Chen-Yu Tsai <wenst@chromium.org> > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.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 94cc077ab3a1..ce398fde48bb 100644 > --- a/drivers/thermal/thermal_of.c > +++ b/drivers/thermal/thermal_of.c > @@ -373,7 +373,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; > int ret = 0; > > tz_np = thermal_of_zone_get_by_name(tz); > @@ -386,12 +386,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); > > -- This clashes with https://lore.kernel.org/linux-pm/1758256.QkHrqEjB74@rjwysocki.net/ which I would prefer to go in first if you don't mind.
On 16/08/2024 13:30, Rafael J. Wysocki wrote: > On Fri, Aug 16, 2024 at 9:40 AM 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: Chen-Yu Tsai <wenst@chromium.org> >> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.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 94cc077ab3a1..ce398fde48bb 100644 >> --- a/drivers/thermal/thermal_of.c >> +++ b/drivers/thermal/thermal_of.c >> @@ -373,7 +373,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; >> int ret = 0; >> >> tz_np = thermal_of_zone_get_by_name(tz); >> @@ -386,12 +386,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); >> >> -- > > This clashes with > > https://lore.kernel.org/linux-pm/1758256.QkHrqEjB74@rjwysocki.net/ > > which I would prefer to go in first if you don't mind. My other patchset which fixes bugs here, could go in before: https://lore.kernel.org/all/20240814195823.437597-1-krzysztof.kozlowski@linaro.org/ so it will be backported. Other than that, I am fine with rebasing my changes. There is no point in refactoring the code if it is being removed/reshuffled :) Best regards, Krzysztof
Changes in v2: - Drop left-over of_node_put in regular exit path (Chen-Yu) - Link to v1: https://lore.kernel.org/r/20240814-b4-cleanup-h-of-node-put-thermal-v1-0-7a1381e1627e@linaro.org Few code simplifications with scope/cleanup.h. One of thermal_of.c patches depends on my earlier fixes: https://lore.kernel.org/all/20240814195823.437597-1-krzysztof.kozlowski@linaro.org/ Best regards, Krzysztof --- Krzysztof Kozlowski (7): thermal: of: Use scoped device node handling to simplify of_find_trip_id() thermal: of: Use scoped device node handling to simplify thermal_of_trips_init() thermal: of: Use scoped device node handling to simplify of_thermal_zone_find() thermal: of: Simplify thermal_of_for_each_cooling_maps() with scoped for each OF child loop thermal: qcom-spmi-adc-tm5: Simplify with scoped for each OF child loop thermal: tegra: Simplify with scoped for each OF child loop thermal: sun8i: Use scoped device node handling to simplify error paths drivers/thermal/qcom/qcom-spmi-adc-tm5.c | 7 ++-- drivers/thermal/sun8i_thermal.c | 11 +++--- drivers/thermal/tegra/soctherm.c | 5 ++- drivers/thermal/thermal_of.c | 62 ++++++++++---------------------- 4 files changed, 28 insertions(+), 57 deletions(-) --- base-commit: aef749dad7ff4c301e91b21fadf30776c1495fa8 change-id: 20240814-b4-cleanup-h-of-node-put-thermal-2268440cc6f7 Best regards,