| Message ID | 20240814-b4-cleanup-h-of-node-put-thermal-v1-3-7a1381e1627e@linaro.org (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | thermal: scope/cleanup.h improvements | expand |
On Wed, Aug 14, 2024 at 10:17:49PM +0200, Krzysztof Kozlowski wrote: > Obtain the device node reference with scoped/cleanup.h to reduce error > handling and make the code a bit simpler. > > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Reviewed-by: Chen-Yu Tsai <wenst@chromium.org> > --- > > This depends on my earlier fixes: > > https://lore.kernel.org/all/20240814195823.437597-1-krzysztof.kozlowski@linaro.org/ > --- > drivers/thermal/thermal_of.c | 18 ++++++------------ > 1 file changed, 6 insertions(+), 12 deletions(-) > > diff --git a/drivers/thermal/thermal_of.c b/drivers/thermal/thermal_of.c > index c8ded4462bb8..fb5472d6ffea 100644 > --- a/drivers/thermal/thermal_of.c > +++ b/drivers/thermal/thermal_of.c > @@ -157,10 +157,9 @@ static struct thermal_trip *thermal_of_trips_init(struct device_node *np, int *n > > static struct device_node *of_thermal_zone_find(struct device_node *sensor, int id) > { > - struct device_node *np, *tz; > struct of_phandle_args sensor_specs; > > - np = of_find_node_by_name(NULL, "thermal-zones"); > + struct device_node *np __free(device_node) = of_find_node_by_name(NULL, "thermal-zones"); > if (!np) { > pr_debug("No thermal zones description\n"); > return ERR_PTR(-ENODEV); > @@ -178,8 +177,7 @@ static struct device_node *of_thermal_zone_find(struct device_node *sensor, int > "#thermal-sensor-cells"); > if (count <= 0) { > pr_err("%pOFn: missing thermal sensor\n", child); > - tz = ERR_PTR(-EINVAL); > - goto out; > + return ERR_PTR(-EINVAL); > } > > for (i = 0; i < count; i++) { > @@ -191,22 +189,18 @@ static struct device_node *of_thermal_zone_find(struct device_node *sensor, int > i, &sensor_specs); > if (ret < 0) { > pr_err("%pOFn: Failed to read thermal-sensors cells: %d\n", child, ret); > - tz = ERR_PTR(ret); > - goto out; > + return ERR_PTR(ret); > } > > if ((sensor == sensor_specs.np) && id == (sensor_specs.args_count ? > sensor_specs.args[0] : 0)) { > pr_debug("sensor %pOFn id=%d belongs to %pOFn\n", sensor, id, child); > - tz = no_free_ptr(child); > - goto out; > + return no_free_ptr(child); > } > } > } > - tz = ERR_PTR(-ENODEV); > -out: > - of_node_put(np); > - return tz; > + > + return ERR_PTR(-ENODEV); > } > > static int thermal_of_monitor_init(struct device_node *np, int *delay, int *pdelay) > > -- > 2.43.0 >
diff --git a/drivers/thermal/thermal_of.c b/drivers/thermal/thermal_of.c index c8ded4462bb8..fb5472d6ffea 100644 --- a/drivers/thermal/thermal_of.c +++ b/drivers/thermal/thermal_of.c @@ -157,10 +157,9 @@ static struct thermal_trip *thermal_of_trips_init(struct device_node *np, int *n static struct device_node *of_thermal_zone_find(struct device_node *sensor, int id) { - struct device_node *np, *tz; struct of_phandle_args sensor_specs; - np = of_find_node_by_name(NULL, "thermal-zones"); + struct device_node *np __free(device_node) = of_find_node_by_name(NULL, "thermal-zones"); if (!np) { pr_debug("No thermal zones description\n"); return ERR_PTR(-ENODEV); @@ -178,8 +177,7 @@ static struct device_node *of_thermal_zone_find(struct device_node *sensor, int "#thermal-sensor-cells"); if (count <= 0) { pr_err("%pOFn: missing thermal sensor\n", child); - tz = ERR_PTR(-EINVAL); - goto out; + return ERR_PTR(-EINVAL); } for (i = 0; i < count; i++) { @@ -191,22 +189,18 @@ static struct device_node *of_thermal_zone_find(struct device_node *sensor, int i, &sensor_specs); if (ret < 0) { pr_err("%pOFn: Failed to read thermal-sensors cells: %d\n", child, ret); - tz = ERR_PTR(ret); - goto out; + return ERR_PTR(ret); } if ((sensor == sensor_specs.np) && id == (sensor_specs.args_count ? sensor_specs.args[0] : 0)) { pr_debug("sensor %pOFn id=%d belongs to %pOFn\n", sensor, id, child); - tz = no_free_ptr(child); - goto out; + return no_free_ptr(child); } } } - tz = ERR_PTR(-ENODEV); -out: - of_node_put(np); - return tz; + + return ERR_PTR(-ENODEV); } static int thermal_of_monitor_init(struct device_node *np, int *delay, int *pdelay)
Obtain the device node reference with scoped/cleanup.h to reduce error handling and make the code a bit simpler. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> --- This depends on my earlier fixes: https://lore.kernel.org/all/20240814195823.437597-1-krzysztof.kozlowski@linaro.org/ --- drivers/thermal/thermal_of.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-)