Skip to content

Commit

Permalink
thermal: core: Drop unused .get_trip_*() callbacks
Browse files Browse the repository at this point in the history
After recent changes in the ACPI thermal driver and in the Intel DTS
IOSF thermal driver, all thermal zone drivers are expected to use trip
tables for initialization and none of them should implement
.get_trip_type(), .get_trip_temp() or .get_trip_hyst() callbacks, so
drop these callbacks entirely from the core.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
  • Loading branch information
rafaeljw committed Aug 29, 2023
1 parent 9580dfb commit 35d8dbb
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 26 deletions.
2 changes: 1 addition & 1 deletion drivers/thermal/thermal_core.c
Original file line number Diff line number Diff line change
Expand Up @@ -1266,7 +1266,7 @@ thermal_zone_device_register_with_trips(const char *type, struct thermal_trip *t
return ERR_PTR(-EINVAL);
}

if (num_trips > 0 && (!ops->get_trip_type || !ops->get_trip_temp) && !trips)
if (num_trips > 0 && !trips)
return ERR_PTR(-EINVAL);

if (!thermal_class)
Expand Down
24 changes: 3 additions & 21 deletions drivers/thermal/thermal_trip.c
Original file line number Diff line number Diff line change
Expand Up @@ -101,29 +101,11 @@ void __thermal_zone_set_trips(struct thermal_zone_device *tz)
int __thermal_zone_get_trip(struct thermal_zone_device *tz, int trip_id,
struct thermal_trip *trip)
{
int ret;

if (!tz || trip_id < 0 || trip_id >= tz->num_trips || !trip)
if (!tz || !tz->trips || trip_id < 0 || trip_id >= tz->num_trips || !trip)
return -EINVAL;

if (tz->trips) {
*trip = tz->trips[trip_id];
return 0;
}

if (tz->ops->get_trip_hyst) {
ret = tz->ops->get_trip_hyst(tz, trip_id, &trip->hysteresis);
if (ret)
return ret;
} else {
trip->hysteresis = 0;
}

ret = tz->ops->get_trip_temp(tz, trip_id, &trip->temperature);
if (ret)
return ret;

return tz->ops->get_trip_type(tz, trip_id, &trip->type);
*trip = tz->trips[trip_id];
return 0;
}
EXPORT_SYMBOL_GPL(__thermal_zone_get_trip);

Expand Down
4 changes: 0 additions & 4 deletions include/linux/thermal.h
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,7 @@ struct thermal_zone_device_ops {
int (*set_trips) (struct thermal_zone_device *, int, int);
int (*change_mode) (struct thermal_zone_device *,
enum thermal_device_mode);
int (*get_trip_type) (struct thermal_zone_device *, int,
enum thermal_trip_type *);
int (*get_trip_temp) (struct thermal_zone_device *, int, int *);
int (*set_trip_temp) (struct thermal_zone_device *, int, int);
int (*get_trip_hyst) (struct thermal_zone_device *, int, int *);
int (*set_trip_hyst) (struct thermal_zone_device *, int, int);
int (*get_crit_temp) (struct thermal_zone_device *, int *);
int (*set_emul_temp) (struct thermal_zone_device *, int);
Expand Down

0 comments on commit 35d8dbb

Please sign in to comment.