diff options
| author | Daniel Lezcano <[email protected]> | 2023-12-13 13:13:22 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <[email protected]> | 2023-12-13 14:35:32 +0100 |
| commit | 404f62cd6407f163e03cfaca97e27c1c4c62eb3c (patch) | |
| tree | fe3778b1e8785eb979ddf74b2ed88599f281a69b | |
| parent | bdc22c8d52d70fc5655ab4dbf72fa79b034bb7b5 (diff) | |
thermal/core: Check get_temp ops is present when registering a tz
Initially the check against the get_temp ops in the
thermal_zone_device_update() was put in there in order to catch
drivers not providing this method.
Instead of checking again and again the function if the ops exists in
the update function, let's do the check at registration time, so it is
checked one time and for all.
Signed-off-by: Daniel Lezcano <[email protected]>
Signed-off-by: Rafael J. Wysocki <[email protected]>
| -rw-r--r-- | drivers/thermal/thermal_core.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c index e5434cdbf23b..2415dc50c31d 100644 --- a/drivers/thermal/thermal_core.c +++ b/drivers/thermal/thermal_core.c @@ -434,11 +434,6 @@ void __thermal_zone_device_update(struct thermal_zone_device *tz, if (atomic_read(&in_suspend)) return; - if (WARN_ONCE(!tz->ops->get_temp, - "'%s' must not be called without 'get_temp' ops set\n", - __func__)) - return; - if (!thermal_zone_device_is_enabled(tz)) return; @@ -1285,7 +1280,7 @@ thermal_zone_device_register_with_trips(const char *type, struct thermal_trip *t return ERR_PTR(-EINVAL); } - if (!ops) { + if (!ops || !ops->get_temp) { pr_err("Thermal zone device ops not defined\n"); return ERR_PTR(-EINVAL); } |