From patchwork Tue Apr 27 19:44:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: thermal-bot for Lad Prabhakar X-Patchwork-Id: 428987 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-20.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 48C88C43460 for ; Tue, 27 Apr 2021 19:44:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2228C613F6 for ; Tue, 27 Apr 2021 19:44:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238953AbhD0TpQ (ORCPT ); Tue, 27 Apr 2021 15:45:16 -0400 Received: from Galois.linutronix.de ([193.142.43.55]:43146 "EHLO galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238961AbhD0TpP (ORCPT ); Tue, 27 Apr 2021 15:45:15 -0400 Date: Tue, 27 Apr 2021 19:44:30 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1619552671; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=B9mrBFug5DTdAgBUg/6ewFyMTGJtdcJlZ4dFTJaYEu4=; b=0jrr0FlCnWLpGjumCItmf3UibdqHXrUeQuOukPvjjIvmEjr18eQ4oVUXz/fCe81/fXw17d VhcemtG7PgT8Eqpsu7H5HzLWd+FKUDlfjdlxNm6N3JYxfD10+TsjxwUUNjBq6ZeSDLGwFg IV+AtYYEquhYUci3HIUEHqOSUlkaToBFEtdibcSsCCFbHOAwyH8bxCzeAE8ayNyJhL+d5R VhYcJSYplzMsAbgTILU5i6ffHqZDmcaCzN5WEoC9A6S3RgRg/N0LBmvk1GMP6Z12R7ZD1s 8oQHd8qpVxZODvH0WthwGg7zpnRldmuJvxC+HI3weSUnXigWpfHotWeS6iE0hQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1619552671; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=B9mrBFug5DTdAgBUg/6ewFyMTGJtdcJlZ4dFTJaYEu4=; b=YneuUhLmvgZRdolV8tx9dPB/lQ37I20E+SvmbJU8+APcbfnxJ++/BkJJPFTJDR4Mjbq3Js IrZs/9juv0QRa+Dg== From: "thermal-bot for Thara Gopinath" Sender: tip-bot2@linutronix.de Reply-to: linux-pm@vger.kernel.org To: linux-pm@vger.kernel.org Subject: [thermal: thermal/next] iwlwifi: mvm: tt: Replace thermal_notify_framework Cc: Kalle Valo , Thara Gopinath , Daniel Lezcano , rui.zhang@intel.com, amitk@kernel.org In-Reply-To: <20210122023406.3500424-2-thara.gopinath@linaro.org> References: <20210122023406.3500424-2-thara.gopinath@linaro.org> MIME-Version: 1.0 Message-ID: <161955267041.29796.9891161624431870692.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org 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 AuthorDate: Thu, 21 Jan 2021 21:34:04 -05:00 Committer: Daniel Lezcano 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 Signed-off-by: Thara Gopinath Signed-off-by: Daniel Lezcano Link: https://lore.kernel.org/r/20210122023406.3500424-2-thara.gopinath@linaro.org --- drivers/net/wireless/intel/iwlwifi/mvm/tt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 */ }