[thermal:,thermal/next] iwlwifi: mvm: tt: Replace thermal_notify_framework

Commit Message

tip-bot2 for Nam Cao April 27, 2021, 7:44 p.m. UTC

The following commit has been merged into the thermal/next branch of thermal:

Commit-ID:     93effd83b6927c0252bb1e35aa3e116d3e2527bb
Gitweb:        https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git//93effd83b6927c0252bb1e35aa3e116d3e2527bb
Author:        Thara Gopinath <[e-mail]>
AuthorDate:    Thu, 21 Jan 2021 21:34:04 -05:00
Committer:     Daniel Lezcano <[e-mail]>
CommitterDate: Thu, 22 Apr 2021 13:11:35 +02:00

iwlwifi: mvm: tt: Replace thermal_notify_framework

thermal_notify_framework just updates for a single trip point where as
thermal_zone_device_update does other bookkeeping like updating the
temperature of the thermal zone and setting the next trip point etc.
Replace thermal_notify_framework with thermal_zone_device_update as the
later is more thorough.

Acked-by: Kalle Valo <[e-mail]>
Signed-off-by: Thara Gopinath <[e-mail]>
Signed-off-by: Daniel Lezcano <[e-mail]>
Link: https://lore.kernel.org/r/[e-mail]
---
 drivers/net/wireless/intel/iwlwifi/mvm/tt.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Patch

diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tt.c b/drivers/net/wireless/intel/iwlwifi/mvm/tt.c
index 2a7339b..398390c 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/tt.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/tt.c
@@ -146,8 +146,8 @@  void iwl_mvm_temp_notif(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb)
 	if (mvm->tz_device.tzone) {
 		struct iwl_mvm_thermal_device *tz_dev = &mvm->tz_device;
 
-		thermal_notify_framework(tz_dev->tzone,
-					 tz_dev->fw_trips_index[ths_crossed]);
+		thermal_zone_device_update(tz_dev->tzone,
+					   THERMAL_TRIP_VIOLATED);
 	}
 #endif /* CONFIG_THERMAL */
 }