Skip to content

Commit 8309135

Browse files
krzkrafaeljw
authored andcommitted
thermal: of: Use scoped device node handling to simplify of_thermal_zone_find()
Obtain the device node reference with scoped/cleanup.h to reduce error handling and make the code a bit simpler. Reviewed-by: Chen-Yu Tsai <wenst@chromium.org> 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-3-bfbe29ad81f4@linaro.org Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
1 parent a094ccf commit 8309135

File tree

1 file changed

+6
-12
lines changed

1 file changed

+6
-12
lines changed

drivers/thermal/thermal_of.c

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -125,10 +125,9 @@ static struct thermal_trip *thermal_of_trips_init(struct device_node *np, int *n
125125

126126
static struct device_node *of_thermal_zone_find(struct device_node *sensor, int id)
127127
{
128-
struct device_node *np, *tz;
129128
struct of_phandle_args sensor_specs;
130129

131-
np = of_find_node_by_name(NULL, "thermal-zones");
130+
struct device_node *np __free(device_node) = of_find_node_by_name(NULL, "thermal-zones");
132131
if (!np) {
133132
pr_debug("No thermal zones description\n");
134133
return ERR_PTR(-ENODEV);
@@ -146,8 +145,7 @@ static struct device_node *of_thermal_zone_find(struct device_node *sensor, int
146145
"#thermal-sensor-cells");
147146
if (count <= 0) {
148147
pr_err("%pOFn: missing thermal sensor\n", child);
149-
tz = ERR_PTR(-EINVAL);
150-
goto out;
148+
return ERR_PTR(-EINVAL);
151149
}
152150

153151
for (i = 0; i < count; i++) {
@@ -159,22 +157,18 @@ static struct device_node *of_thermal_zone_find(struct device_node *sensor, int
159157
i, &sensor_specs);
160158
if (ret < 0) {
161159
pr_err("%pOFn: Failed to read thermal-sensors cells: %d\n", child, ret);
162-
tz = ERR_PTR(ret);
163-
goto out;
160+
return ERR_PTR(ret);
164161
}
165162

166163
if ((sensor == sensor_specs.np) && id == (sensor_specs.args_count ?
167164
sensor_specs.args[0] : 0)) {
168165
pr_debug("sensor %pOFn id=%d belongs to %pOFn\n", sensor, id, child);
169-
tz = no_free_ptr(child);
170-
goto out;
166+
return no_free_ptr(child);
171167
}
172168
}
173169
}
174-
tz = ERR_PTR(-ENODEV);
175-
out:
176-
of_node_put(np);
177-
return tz;
170+
171+
return ERR_PTR(-ENODEV);
178172
}
179173

180174
static int thermal_of_monitor_init(struct device_node *np, int *delay, int *pdelay)

0 commit comments

Comments
 (0)