Skip to content

Commit 46f5bef

Browse files
committed
thermal: core: Drop the .set_trip_hyst() thermal zone operation
None of the users of the thermal core provides a .set_trip_hyst() thermal zone operation, so drop that callback from struct thermal_zone_device_ops and update trip_point_hyst_store() accordingly. No functional impact. Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Reviewed-by: Daniel Lezcano <daniel.lezcano@linaro.org>
1 parent 5340f76 commit 46f5bef

File tree

2 files changed

+0
-8
lines changed

2 files changed

+0
-8
lines changed

drivers/thermal/thermal_sysfs.c

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -174,18 +174,11 @@ trip_point_hyst_store(struct device *dev, struct device_attribute *attr,
174174
trip = &tz->trips[trip_id];
175175

176176
if (hyst != trip->hysteresis) {
177-
if (tz->ops.set_trip_hyst) {
178-
ret = tz->ops.set_trip_hyst(tz, trip_id, hyst);
179-
if (ret)
180-
goto unlock;
181-
}
182-
183177
trip->hysteresis = hyst;
184178

185179
thermal_zone_trip_updated(tz, trip);
186180
}
187181

188-
unlock:
189182
mutex_unlock(&tz->lock);
190183

191184
return ret ? ret : count;

include/linux/thermal.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ struct thermal_zone_device_ops {
9191
int (*change_mode) (struct thermal_zone_device *,
9292
enum thermal_device_mode);
9393
int (*set_trip_temp) (struct thermal_zone_device *, int, int);
94-
int (*set_trip_hyst) (struct thermal_zone_device *, int, int);
9594
int (*get_crit_temp) (struct thermal_zone_device *, int *);
9695
int (*set_emul_temp) (struct thermal_zone_device *, int);
9796
int (*get_trend) (struct thermal_zone_device *,

0 commit comments

Comments
 (0)