diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-01-10 20:43:54 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-01-10 20:43:54 -0800 |
commit | fe2437ccbd278af683d32196fdea59a3b95f144e (patch) | |
tree | 31f2907756e483fc25b7c1c0ff9d1d0c2721b45c /tools | |
parent | b35b6d4d71365fbfb6f2cc8edc331b3882ca817e (diff) | |
parent | fff489ff0722bec127a05667bec00ea45cf9f77e (diff) |
Merge tag 'thermal-5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull thermal control updates from Rafael Wysocki:
"These add a new driver for Renesas RZ/G2L TSU, update a few existing
thermal control drivers and clean up the tmon utility.
Specifics:
- Add new TSU driver and DT bindings for the Renesas RZ/G2L platform
(Biju Das).
- Fix missing check when calling reset_control_deassert() in the
rz2gl thermal driver (Biju Das).
- In preparation for FORTIFY_SOURCE performing compile-time and
run-time field bounds checking for memcpy(), avoid intentionally
writing across neighboring fields in the int340x thermal control
driver (Kees Cook).
- Fix RFIM mailbox write commands handling in the int340x thermal
control driver (Sumeet Pawnikar).
- Fix PM issue occurring in the iMX thermal control driver during
suspend/resume by implementing PM runtime support in it (Oleksij
Rempel).
- Add 'const' annotation to thermal_cooling_ops in the Intel
powerclamp driver (Rikard Falkeborn).
- Fix missing ADC bit set in the iMX8MP thermal driver to enable the
sensor (Paul Gerber).
- Drop unused local variable definition from tmon (ran jianping)"
* tag 'thermal-5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
thermal/drivers/int340x: Fix RFIM mailbox write commands
thermal/drivers/rz2gl: Add error check for reset_control_deassert()
thermal/drivers/imx8mm: Enable ADC when enabling monitor
thermal/drivers: Add TSU driver for RZ/G2L
dt-bindings: thermal: Document Renesas RZ/G2L TSU
thermal/drivers/intel_powerclamp: Constify static thermal_cooling_device_ops
thermal/drivers/imx: Implement runtime PM support
thermal: tools: tmon: remove unneeded local variable
thermal: int340x: Use struct_group() for memcpy() region
Diffstat (limited to 'tools')
-rw-r--r-- | tools/thermal/tmon/pid.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/thermal/tmon/pid.c b/tools/thermal/tmon/pid.c index c54edb4f630c..296f69c00c57 100644 --- a/tools/thermal/tmon/pid.c +++ b/tools/thermal/tmon/pid.c @@ -54,7 +54,6 @@ static double xk_1, xk_2; /* input temperature x[k-#] */ */ int init_thermal_controller(void) { - int ret = 0; /* init pid params */ p_param.ts = ticktime; @@ -65,7 +64,7 @@ int init_thermal_controller(void) p_param.t_target = target_temp_user; - return ret; + return 0; } void controller_reset(void) |