diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2023-05-03 16:44:35 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2023-05-03 16:44:35 +0300 |
| commit | 53389edd4020514b876b01d05e851fb7d46eb51f (patch) | |
| tree | fc3c98a0a91e627dcb900415ca399eaebe1727cd /include | |
| parent | dd2358321e1aa0cf3808b353e02fae2ddf005a72 (diff) | |
| parent | 2b6a7409ac390d3edb49822ea602ac129486ea3f (diff) | |
| download | linux-53389edd4020514b876b01d05e851fb7d46eb51f.tar.xz | |
Merge branch 'thermal-core'
Merge additional thermal core and ACPI thermal changes for 6.4-rc1:
- Clean up the step-wise thermal governor (Zhang Rui).
- Introduce thermal_zone_device() for accessing the device field of
struct thermal_zone_device and two drivers use it (Daniel Lezcano).
- Clean up the ACPI thermal driver a bit (Daniel Lezcano).
- Delete the thermal driver for Intel Menlow platforms that is not
expected to have any users (Rafael Wysocki).
* thermal-core:
thermal: intel: menlow: Get rid of this driver
ACPI: thermal: Move to dedicated function sysfs extra attr creation
ACPI: thermal: Use thermal_zone_device()
thermal: intel: pch_thermal: Use thermal driver device to write a trace
thermal: core: Encapsulate tz->device field
thermal: gov_step_wise: Adjust code logic to match comment
thermal: gov_step_wise: Delete obsolete comment
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/thermal.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/thermal.h b/include/linux/thermal.h index 82ddb32f9876..87837094d549 100644 --- a/include/linux/thermal.h +++ b/include/linux/thermal.h @@ -313,6 +313,7 @@ thermal_zone_device_register_with_trips(const char *, struct thermal_trip *, int void *thermal_zone_device_priv(struct thermal_zone_device *tzd); const char *thermal_zone_device_type(struct thermal_zone_device *tzd); int thermal_zone_device_id(struct thermal_zone_device *tzd); +struct device *thermal_zone_device(struct thermal_zone_device *tzd); int thermal_zone_bind_cooling_device(struct thermal_zone_device *, int, struct thermal_cooling_device *, |