Skip to content

Commit ad2f8bc

Browse files
committed
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: Rafael J. Wysocki <[email protected]> Reviewed-by: Lukasz Luba <[email protected]> Acked-by: Daniel Lezcano <[email protected]>
1 parent c1beda1 commit ad2f8bc

File tree

2 files changed

+0
-15
lines changed

2 files changed

+0
-15
lines changed

drivers/thermal/thermal_core.c

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -310,15 +310,6 @@ static struct thermal_governor *thermal_get_tz_governor(struct thermal_zone_devi
310310
return def_governor;
311311
}
312312

313-
static void handle_non_critical_trips(struct thermal_zone_device *tz,
314-
const struct thermal_trip *trip)
315-
{
316-
struct thermal_governor *governor = thermal_get_tz_governor(tz);
317-
318-
if (governor->throttle)
319-
governor->throttle(tz, trip);
320-
}
321-
322313
void thermal_governor_update_tz(struct thermal_zone_device *tz,
323314
enum thermal_notify_event reason)
324315
{
@@ -418,8 +409,6 @@ static void handle_thermal_trip(struct thermal_zone_device *tz,
418409

419410
if (trip->type == THERMAL_TRIP_CRITICAL || trip->type == THERMAL_TRIP_HOT)
420411
handle_critical_trips(tz, trip);
421-
else
422-
handle_non_critical_trips(tz, trip);
423412
}
424413

425414
static void update_temperature(struct thermal_zone_device *tz)

drivers/thermal/thermal_core.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ struct thermal_trip_desc {
3232
* thermal zone.
3333
* @trip_crossed: called for trip points that have just been crossed
3434
* @manage: called on thermal zone temperature updates
35-
* @throttle: callback called for every trip point even if temperature is
36-
* below the trip point temperature
3735
* @update_tz: callback called when thermal zone internals have changed, e.g.
3836
* thermal cooling instance was added/removed
3937
* @governor_list: node in thermal_governor_list (in thermal_core.c)
@@ -46,8 +44,6 @@ struct thermal_governor {
4644
const struct thermal_trip *trip,
4745
bool crossed_up);
4846
void (*manage)(struct thermal_zone_device *tz);
49-
int (*throttle)(struct thermal_zone_device *tz,
50-
const struct thermal_trip *trip);
5147
void (*update_tz)(struct thermal_zone_device *tz,
5248
enum thermal_notify_event reason);
5349
struct list_head governor_list;

0 commit comments

Comments
 (0)