diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2022-10-04 16:48:16 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2022-10-04 16:48:16 +0200 |
| commit | e021563fd09e1fd4041a6a573ec10fb5b5d275b0 (patch) | |
| tree | ccc522b781867fdeb8e232f95ad89debfb58b9a9 /include/linux | |
| parent | a5088ee7251e5106a4efa9588a73866eb4b4154e (diff) | |
| parent | b0c883e900702f408d62cf92b0ef01303ed69be9 (diff) | |
Merge tag 'thermal-v6.1-rc1-2' of https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux
Pull thermal control fixes for 6.1-rc1 from Daniel Lezcano:
"- Used the platform data to get the sensor id instead of parsing the
device in the driver and remove the dedicated OF function (Daniel
Lezcano)
- Fixed Kconfig dependency for the QCom tsens driver (Jonathan Cameron)
- Fixed missing const annotation for the RCar ops driver and removed a
duplicate parameter check (Lad Prabhakar)
- Fixed a NULL pointer dereference when calling set_trip_temp() (Lad
Prabhakar)
- Fixed the fourth hardware id in the QCom tsens driver (Vincent
Knecht)"
* tag 'thermal-v6.1-rc1-2' of https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux:
thermal/drivers/qcom/tsens-v0_1: Fix MSM8939 fourth sensor hw_id
thermal/core: Add a check before calling set_trip_temp()
thermal/core: Drop valid pointer check for type
thermal/drivers/rcar_thermal: Constify static thermal_zone_device_ops
thermal/drivers/qcom: Drop false build dependency of all QCOM drivers on QCOM_TSENS
thermal/of: Remove the thermal_zone_of_get_sensor_id() function
thermal/drivers/imx_sc: Rely on the platform data to get the resource id
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/thermal.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/include/linux/thermal.h b/include/linux/thermal.h index 6f1ec4fb7ef8..9ecc128944a1 100644 --- a/include/linux/thermal.h +++ b/include/linux/thermal.h @@ -308,9 +308,6 @@ void devm_thermal_of_zone_unregister(struct device *dev, struct thermal_zone_dev void thermal_of_zone_unregister(struct thermal_zone_device *tz); -int thermal_zone_of_get_sensor_id(struct device_node *tz_np, - struct device_node *sensor_np, - u32 *id); #else static inline struct thermal_zone_device *thermal_of_zone_register(struct device_node *sensor, int id, void *data, @@ -334,13 +331,6 @@ static inline void devm_thermal_of_zone_unregister(struct device *dev, struct thermal_zone_device *tz) { } - -static inline int thermal_zone_of_get_sensor_id(struct device_node *tz_np, - struct device_node *sensor_np, - u32 *id) -{ - return -ENOENT; -} #endif #ifdef CONFIG_THERMAL |