Commit 35d8dbbb authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

thermal: core: Drop unused .get_trip_*() callbacks 



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: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 9580dfb8

drivers/thermal/thermal_core.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

drivers/thermal/thermal_trip.c

+3 −21
Original line number Diff line number Diff line
@@ -101,30 +101,12 @@ 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);

}

EXPORT_SYMBOL_GPL(__thermal_zone_get_trip);



int thermal_zone_get_trip(struct thermal_zone_device *tz, int trip_id,

include/linux/thermal.h

+0 −4
Original line number Diff line number Diff line
@@ -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);