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

thermal: core: Drop the .throttle() governor callback 



Since all of the governors in the tree have been switched over to using
the new callbacks, either .trip_crossed() or .manage(), the .throttle()
governor callback is not used any more, so drop it.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: default avatarLukasz Luba <lukasz.luba@arm.com>
Acked-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
parent c1beda1c

drivers/thermal/thermal_core.c

+0 −11
Original line number Diff line number Diff line
@@ -310,15 +310,6 @@ static struct thermal_governor *thermal_get_tz_governor(struct thermal_zone_devi 
	return def_governor;

}



static void handle_non_critical_trips(struct thermal_zone_device *tz,

				      const struct thermal_trip *trip)

{

	struct thermal_governor *governor = thermal_get_tz_governor(tz);



	if (governor->throttle)

		governor->throttle(tz, trip);

}



void thermal_governor_update_tz(struct thermal_zone_device *tz,

				enum thermal_notify_event reason)

{
@@ -418,8 +409,6 @@ static void handle_thermal_trip(struct thermal_zone_device *tz, 


	if (trip->type == THERMAL_TRIP_CRITICAL || trip->type == THERMAL_TRIP_HOT)

		handle_critical_trips(tz, trip);

	else

		handle_non_critical_trips(tz, trip);

}



static void update_temperature(struct thermal_zone_device *tz)

drivers/thermal/thermal_core.h

+0 −4
Original line number Diff line number Diff line
@@ -32,8 +32,6 @@ struct thermal_trip_desc { 
 *			thermal zone.

 * @trip_crossed:	called for trip points that have just been crossed

 * @manage:	called on thermal zone temperature updates

 * @throttle:	callback called for every trip point even if temperature is

 *		below the trip point temperature

 * @update_tz:	callback called when thermal zone internals have changed, e.g.

 *		thermal cooling instance was added/removed

 * @governor_list:	node in thermal_governor_list (in thermal_core.c)
@@ -46,8 +44,6 @@ struct thermal_governor { 
			     const struct thermal_trip *trip,

			     bool crossed_up);

	void (*manage)(struct thermal_zone_device *tz);

	int (*throttle)(struct thermal_zone_device *tz,

			const struct thermal_trip *trip);

	void (*update_tz)(struct thermal_zone_device *tz,

			  enum thermal_notify_event reason);

	struct list_head	governor_list;