summaryrefslogtreecommitdiff
path: root/include/linux/thermal.h
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2024-08-19 14:42:19 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2024-08-19 14:42:19 +0200
commit5ae98b5a9f3aaacf62c34942e7efbee3de2b4abb (patch)
tree0dda5e3ba5ce49ce26af04e31c31c4f8951fcb9e /include/linux/thermal.h
parent6e6f58a170ea98e44075b761f2da42a5aec47dfb (diff)
parent107280e1371f1ba183be1ac88e91ec60cad33c18 (diff)
Merge back thermal core material for 6.12.
Diffstat (limited to 'include/linux/thermal.h')
-rw-r--r--include/linux/thermal.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/thermal.h b/include/linux/thermal.h
index b86ddca46b9e..ba6d74c11620 100644
--- a/include/linux/thermal.h
+++ b/include/linux/thermal.h
@@ -203,15 +203,12 @@ static inline void devm_thermal_of_zone_unregister(struct device *dev,
}
#endif
-int thermal_zone_get_trip(struct thermal_zone_device *tz, int trip_id,
- struct thermal_trip *trip);
int for_each_thermal_trip(struct thermal_zone_device *tz,
int (*cb)(struct thermal_trip *, void *),
void *data);
int thermal_zone_for_each_trip(struct thermal_zone_device *tz,
int (*cb)(struct thermal_trip *, void *),
void *data);
-int thermal_zone_get_num_trips(struct thermal_zone_device *tz);
void thermal_zone_set_trip_temp(struct thermal_zone_device *tz,
struct thermal_trip *trip, int temp);