Skip to content

Commit d161cbd

Browse files
tq-steinaDaniel Lezcano
authored andcommitted
thermal/of: Add OF node address to output message
Temperature sensors are supposed to have the DT node name temperature-sensors. Having multiple ones the node name alone isn't very helpful. Add the node address to make them more distinguishable. Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com> Reviewed-by: Lukasz Luba <lukasz.luba@arm.com> Link: https://patch.msgid.link/20260305163508.2643106-1-alexander.stein@ew.tq-group.com Signed-off-by: Daniel Lezcano <daniel.lezcano@kernel.org>
1 parent 1f318b9 commit d161cbd

1 file changed

Lines changed: 10 additions & 10 deletions

File tree

drivers/thermal/thermal_of.c

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ static struct device_node *of_thermal_zone_find(struct device_node *sensor, int
144144
count = of_count_phandle_with_args(child, "thermal-sensors",
145145
"#thermal-sensor-cells");
146146
if (count <= 0) {
147-
pr_err("%pOFn: missing thermal sensor\n", child);
147+
pr_err("%pOFP: missing thermal sensor\n", child);
148148
return ERR_PTR(-EINVAL);
149149
}
150150

@@ -156,14 +156,14 @@ static struct device_node *of_thermal_zone_find(struct device_node *sensor, int
156156
"#thermal-sensor-cells",
157157
i, &sensor_specs);
158158
if (ret < 0) {
159-
pr_err("%pOFn: Failed to read thermal-sensors cells: %d\n", child, ret);
159+
pr_err("%pOFP: Failed to read thermal-sensors cells: %d\n", child, ret);
160160
return ERR_PTR(ret);
161161
}
162162

163163
of_node_put(sensor_specs.np);
164164
if ((sensor == sensor_specs.np) && id == (sensor_specs.args_count ?
165165
sensor_specs.args[0] : 0)) {
166-
pr_debug("sensor %pOFn id=%d belongs to %pOFn\n", sensor, id, child);
166+
pr_debug("sensor %pOFP id=%d belongs to %pOFP\n", sensor, id, child);
167167
return no_free_ptr(child);
168168
}
169169
}
@@ -180,15 +180,15 @@ static int thermal_of_monitor_init(struct device_node *np, int *delay, int *pdel
180180
if (ret == -EINVAL) {
181181
*pdelay = 0;
182182
} else if (ret < 0) {
183-
pr_err("%pOFn: Couldn't get polling-delay-passive: %d\n", np, ret);
183+
pr_err("%pOFP: Couldn't get polling-delay-passive: %d\n", np, ret);
184184
return ret;
185185
}
186186

187187
ret = of_property_read_u32(np, "polling-delay", delay);
188188
if (ret == -EINVAL) {
189189
*delay = 0;
190190
} else if (ret < 0) {
191-
pr_err("%pOFn: Couldn't get polling-delay: %d\n", np, ret);
191+
pr_err("%pOFP: Couldn't get polling-delay: %d\n", np, ret);
192192
return ret;
193193
}
194194

@@ -380,23 +380,23 @@ static struct thermal_zone_device *thermal_of_zone_register(struct device_node *
380380
np = of_thermal_zone_find(sensor, id);
381381
if (IS_ERR(np)) {
382382
if (PTR_ERR(np) != -ENODEV)
383-
pr_err("Failed to find thermal zone for %pOFn id=%d\n", sensor, id);
383+
pr_err("Failed to find thermal zone for %pOFP id=%d\n", sensor, id);
384384
return ERR_CAST(np);
385385
}
386386

387387
trips = thermal_of_trips_init(np, &ntrips);
388388
if (IS_ERR(trips)) {
389-
pr_err("Failed to parse trip points for %pOFn id=%d\n", sensor, id);
389+
pr_err("Failed to parse trip points for %pOFP id=%d\n", sensor, id);
390390
ret = PTR_ERR(trips);
391391
goto out_of_node_put;
392392
}
393393

394394
if (!trips)
395-
pr_info("No trip points found for %pOFn id=%d\n", sensor, id);
395+
pr_info("No trip points found for %pOFP id=%d\n", sensor, id);
396396

397397
ret = thermal_of_monitor_init(np, &delay, &pdelay);
398398
if (ret) {
399-
pr_err("Failed to initialize monitoring delays from %pOFn\n", np);
399+
pr_err("Failed to initialize monitoring delays from %pOFP\n", np);
400400
goto out_kfree_trips;
401401
}
402402

@@ -417,7 +417,7 @@ static struct thermal_zone_device *thermal_of_zone_register(struct device_node *
417417
pdelay, delay);
418418
if (IS_ERR(tz)) {
419419
ret = PTR_ERR(tz);
420-
pr_err("Failed to register thermal zone %pOFn: %d\n", np, ret);
420+
pr_err("Failed to register thermal zone %pOFP: %d\n", np, ret);
421421
goto out_kfree_trips;
422422
}
423423

0 commit comments

Comments
 (0)