From patchwork Thu Mar 9 09:28:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 66728 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp191210wrd; Thu, 9 Mar 2023 01:33:25 -0800 (PST) X-Google-Smtp-Source: AK7set99RqwhOEmndfk6+NIKScHmrJR8hVBcJmHsUawu3xYU+M+kIlvVB72EBybiTFpsIR494khf X-Received: by 2002:a17:902:e5c2:b0:19e:7d67:84e6 with SMTP id u2-20020a170902e5c200b0019e7d6784e6mr27090380plf.0.1678354405062; Thu, 09 Mar 2023 01:33:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678354405; cv=none; d=google.com; s=arc-20160816; b=Xr33vqxqAzSNAO4rlPo2cZLP35+ItlW+GK7KkkIABC+614yaqCiHS7C6HOlm5Yyo/b NzUrmUtgI8xRIgnyM8ytYBaptxK5hfRI0q9UsfI7xvGrWvzFXPq4bHlQieisiUyx1h3I rgIfnh2bhuZR6AV++pc6piMqDpFHJ8HhqwrwetM35cA1yQKzx1A8qAHANIc3SlxQ7kbY xbsVS5VzvCFb5nj+cy6nmM6LGBA20gd0DuhHwxtHN1KSS3WR35NbaiA6nMozmSlZ4J39 13lQt8x0TgGMbVPfmFeFRqF5z/2ZUIRAfuVJcCt0PW+wiJKALMhlXdgtM5WOO6GL9t+k +yog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=9b973OIjh2A0q4it2tRxdKfeAcI3pT5uZD5jTJWInpI=; b=ENtjs6GsD84rtj2BjBlUHYpXRTJTLcVAYLmrbmL6L0IELwYrz6netxATeAokQaUgxg PMzemG+QOyCxSgu7BXQToR50wzit6QCL5QioNEGof45NvC/TrqqTBuJV7JR3XfNq+f7p U6njHTVhS0Tgkx/kwqngvNoDvZDHDZkZNafAxq779PBFYP+4shX5iv/+lRB60qtq3Iuw mBS0yi6Km3JGwCkcEiPxU8ys0qbys6pDvHuIBLZVTW9FSak6cBmCmU79iO66lMo/+q5D rMOMsq9bvUDe5y8AJcTDXhTVMo4s95pprk7PCkVTcos8dZ/eEckLSS5cFoYdV4UcpSmY Pqeg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="G+l5L/kt"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l2-20020a170903244200b0019e8f83e795si17116230pls.333.2023.03.09.01.33.10; Thu, 09 Mar 2023 01:33:25 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="G+l5L/kt"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230173AbjCIJ2m (ORCPT + 99 others); Thu, 9 Mar 2023 04:28:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36716 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229891AbjCIJ2k (ORCPT ); Thu, 9 Mar 2023 04:28:40 -0500 Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CD21C5D46D for ; Thu, 9 Mar 2023 01:28:38 -0800 (PST) Received: by mail-wm1-x334.google.com with SMTP id l7-20020a05600c1d0700b003eb5e6d906bso757547wms.5 for ; Thu, 09 Mar 2023 01:28:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678354117; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=9b973OIjh2A0q4it2tRxdKfeAcI3pT5uZD5jTJWInpI=; b=G+l5L/kty7Cqd1UGH7h73jbKUw7aklIia6azseJH39wkkEaOOPIHa+jUVGAKq39HuS F+rNWQnOoNPXodONWQLntoaQ0fYQegKV1wB6xzs6i0QzX0SrhxHtokArpDSXHJGchZHT vaX/4pZMBZpnvAWjCzbMJNXEVKIx42yMyLcWdAeg6ZU362GZorQMtXl8VYyv++dDVHLt hAw4zHxpdg2+W+MfGur3ZAhdibifekvB3KCfSkGfoVoMHOHtq6LsEqbrPo+K2K2dv6+k Rq3LyjhJe1MHyxsV3KsOGjVOl6iBrx5RvBoIjyvCZHbLtHY8qp8szWH+pzoYMa07LOK+ sSqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678354117; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=9b973OIjh2A0q4it2tRxdKfeAcI3pT5uZD5jTJWInpI=; b=yZmg4hpsaaMpYMKGY79HwO2dDibfssGtuAnCMAqtKnjdxcdFpuzzFkNS7yMJyrGz1H usfI4ZMvVSkdvWMBNbGEF/28eZSkPksH5cC4PxeckOtXICBnHaA5nGZy0K1ORrNNZber RdCQNJ1QoWGSvrw8z33fivCb0QupY4/95iDtXEHFc+PBefcpC/01GCvZ0iU5v1Q9ptba qcrgJzJ/2C1JvYQT3H4yT99Orskm4U77QqPTsnNnsh5Lql/E1y6P9UNwWH+sdkywOjXf 2pQaxApSj852ooFu4rFbnFxrKjWw4S59WsUnCjWDv/ShVQxGOQMThdoQk3k5j/xDePPQ rBDw== X-Gm-Message-State: AO0yUKUYvB6O8yENoW8/rBNzVFKZeD3uyNqNtioW/Adl72QGDPBMzqAW CHSvR2RbJgIgxPsxPwsch9poKg== X-Received: by 2002:a05:600c:3d14:b0:3df:9858:c033 with SMTP id bh20-20020a05600c3d1400b003df9858c033mr18417688wmb.8.1678354117269; Thu, 09 Mar 2023 01:28:37 -0800 (PST) Received: from mai.box.freepro.com ([2a05:6e02:1041:c10:fbda:65f5:e873:7527]) by smtp.gmail.com with ESMTPSA id t24-20020a1c7718000000b003e209186c07sm1888894wmi.19.2023.03.09.01.28.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Mar 2023 01:28:36 -0800 (PST) From: Daniel Lezcano To: daniel.lezcano@linaro.org, rafael@kernel.org Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, Amit Kucheria , Zhang Rui , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , linux-arm-kernel@lists.infradead.org (moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE) Subject: [PATCH v2 1/2] thermal/drivers/imx: Remove get_trip_temp ops Date: Thu, 9 Mar 2023 10:28:20 +0100 Message-Id: <20230309092821.1590586-1-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759839719019940453?= X-GMAIL-MSGID: =?utf-8?q?1759882148504549907?= The i.MX thermal sensor uses the generic trip points. The thermal framework can return the critical temperature directly. Remove the pointless get_trip_temp ops. Signed-off-by: Daniel Lezcano Reviewed-by: Fabio Estevam --- drivers/thermal/imx_thermal.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/drivers/thermal/imx_thermal.c b/drivers/thermal/imx_thermal.c index c3136978adee..69ed482167f7 100644 --- a/drivers/thermal/imx_thermal.c +++ b/drivers/thermal/imx_thermal.c @@ -330,13 +330,6 @@ static int imx_change_mode(struct thermal_zone_device *tz, return 0; } -static int imx_get_crit_temp(struct thermal_zone_device *tz, int *temp) -{ - *temp = trips[IMX_TRIP_CRITICAL].temperature; - - return 0; -} - static int imx_set_trip_temp(struct thermal_zone_device *tz, int trip, int temp) { @@ -384,7 +377,6 @@ static struct thermal_zone_device_ops imx_tz_ops = { .unbind = imx_unbind, .get_temp = imx_get_temp, .change_mode = imx_change_mode, - .get_crit_temp = imx_get_crit_temp, .set_trip_temp = imx_set_trip_temp, }; From patchwork Thu Mar 9 09:28:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Lezcano X-Patchwork-Id: 66730 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp193937wrd; Thu, 9 Mar 2023 01:41:43 -0800 (PST) X-Google-Smtp-Source: AK7set+EKkNjJL1k+p5mULGDoOk1jvOBBmEwxYD6gCiMTHiitnfkr09nhWouEX6ZqL7G1XkXDtHj X-Received: by 2002:a62:844e:0:b0:5a8:aabf:46f4 with SMTP id k75-20020a62844e000000b005a8aabf46f4mr19717615pfd.8.1678354903139; Thu, 09 Mar 2023 01:41:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678354903; cv=none; d=google.com; s=arc-20160816; b=gppsZ751PV2mMqh+tRrp2m1xfv3MfqfA8DBkY3mfZuUcyEfdIkmi9rMVpDcMOzqxPZ 9Dhy24KvUe96q5N2bRhBh9PVDkm+lSWFEfUQONBjYMW3uSVTZstlQInieSsXAsZLgZ0/ dFdQ1EwIGDykaNjhCJfrB0Dx9xlKdDaAZQ5RVXbJ3LCmVnLvPS4xOxw7Ol/+HIM+jHw2 16023SB+grAton5TZEKlitwOEeho752EkqZv/D8EZUnL5zpsVM99REs4IlTXt3AT2jZS +CmGsL9tHxAFoak92MIhnS6ToBXfUkqqoMfZRyDdt8AHSsv4fVQGXjMOYDF5AdwxRJg0 Uqtg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=WcGx4aXFMGk9frr8lRdRWgHBNAcfS5az84l0THU0sOA=; b=amsrLVvYp37LvFBg3U/z9Mu+6RtuPQjMHfetNyLDAGMkTLCYoyPaDPWiyTQG294TQs 8puaOfwtOpInQe12ptIl0sgjfLHNOVwDHYGpJGbm+NazjjQ3YSI5OmYIjQBF8TDx4/bM WHxk1oY0J0AA04Dh2j5sAT0NiyUlKT1anePZ+m7HIOPP4oMXzrjRsea8rfsh7DcOYPZr dcLBAjFeIGDXdygMnVaxovbFNPL3vAcJ5ZKbXUgzK0Msxox8IhX0OOw+iag78DblCeZz E+hP9mQQPKlYTBs1xz2fITKu++krdelivWVVSSTgm7MckeZ7pPvx59IOigwtKq/LlCLH IU5A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=iIRdp1V9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id r9-20020a63a549000000b00502d75b6681si18682212pgu.228.2023.03.09.01.41.29; Thu, 09 Mar 2023 01:41:43 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=iIRdp1V9; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230259AbjCIJ2o (ORCPT + 99 others); Thu, 9 Mar 2023 04:28:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36712 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230016AbjCIJ2l (ORCPT ); Thu, 9 Mar 2023 04:28:41 -0500 Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AFD9D5D74E for ; Thu, 9 Mar 2023 01:28:39 -0800 (PST) Received: by mail-wm1-x32b.google.com with SMTP id o11-20020a05600c4fcb00b003eb33ea29a8so788449wmq.1 for ; Thu, 09 Mar 2023 01:28:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678354118; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=WcGx4aXFMGk9frr8lRdRWgHBNAcfS5az84l0THU0sOA=; b=iIRdp1V9x4ezfgFrAzbTLkkLE9LA3+EGI2x/sDlKAzubklLkFSd1URVKMbRJU05BOJ WaDYfK8g2ckNQqyLd7zgsLKOckAAQ2qZne9bdqbbcbw+BmzgfaM4UOi8g1XMnl8S383M hlSXR/wmOs/qy/Q76QXA4/0J1Cuqxg2OzL94d0D9SpSpln9i/BMwSLcw0QJQIVEhkIK2 w2jD5KL7cBlaPje33MUF4LgLp7rDrSl3Viz40kUlM3IMqSoXvrzTZJqiw24JfqgLR/B5 Fx3JSD6MDAhKEgHyGRfnGLm8f2k8i+o+QeVRWrvYvwMv3wP4ATjtqiaVFd+c5SDoKuYs kU7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678354118; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=WcGx4aXFMGk9frr8lRdRWgHBNAcfS5az84l0THU0sOA=; b=TpQLhN7QFA01Kc+ZI8gCO/E70O72/8MH6I5HS+2myd7utbdtNVV8Fro5qaJrv13Vye q7GWy3uqP1xy+iV0Izi7XQfySt+dj498sijy7k3CXix7pY4x9XBs/THXGBSNYRrZo2wO agTvkNfloWInLytpsBCS0Ot+mpwqZ4dtnqeFd+J3jRYUaRFskVdKE6pgNV1bm+sl+Pkx TjkFiG37S/r15XhI47c+HPwqoXfM0tG7VLKWjbK9WM6IVvPOUMf5U6cTw5LmB24mQmur pKueA51nlfCcamjLBeL05AetK5j4XKyihoppiNTSdu3428qlCQ9gVI/2Fs6ArH1vRzoH tqDA== X-Gm-Message-State: AO0yUKUUUMQfK0VXxMn9DD+w/hsQ3yS6wcNgWjlaiboi1wUA3i2iAHEf oIMjp6G2SMGD1HjNBgtBRr3GU30mK7I+IPaUeIM= X-Received: by 2002:a05:600c:1c20:b0:3dc:5b88:e6dd with SMTP id j32-20020a05600c1c2000b003dc5b88e6ddmr20167527wms.10.1678354118182; Thu, 09 Mar 2023 01:28:38 -0800 (PST) Received: from mai.box.freepro.com ([2a05:6e02:1041:c10:fbda:65f5:e873:7527]) by smtp.gmail.com with ESMTPSA id t24-20020a1c7718000000b003e209186c07sm1888894wmi.19.2023.03.09.01.28.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Mar 2023 01:28:37 -0800 (PST) From: Daniel Lezcano To: daniel.lezcano@linaro.org, rafael@kernel.org Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, Amit Kucheria , Zhang Rui , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , linux-arm-kernel@lists.infradead.org (moderated list:ARM/FREESCALE IMX / MXC ARM ARCHITECTURE) Subject: [PATCH v2 2/2] thermal/drivers/imx: Use the thermal framework for the trip point Date: Thu, 9 Mar 2023 10:28:21 +0100 Message-Id: <20230309092821.1590586-2-daniel.lezcano@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230309092821.1590586-1-daniel.lezcano@linaro.org> References: <20230309092821.1590586-1-daniel.lezcano@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759882671122393307?= X-GMAIL-MSGID: =?utf-8?q?1759882671122393307?= The thermal framework provides an API to get the trip related to a trip point id. We want to consolidate the generic trip points code, thus preventing the different drivers to deal with the trip points after they registered them. The set_trip_temp ops will be changed regarding the above changes but first we need to rework a bit the different implementation in the drivers. The goal is to prevent using the trip id but use a trip point passed as parameter which will contain all the needed information. As we don't have the trip point passed as parameter yet, we get the trip point using the generic trip thermal framewrok APIs and use it to take exactly the same decisions. The difference with this change and the previous code is from where we get the thermal trip point (which is the same). No functional change intended. Signed-off-by: Daniel Lezcano Reviewed-by: Fabio Estevam --- V2: - Remove extra tab inserted in the previous version --- drivers/thermal/imx_thermal.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/drivers/thermal/imx_thermal.c b/drivers/thermal/imx_thermal.c index 69ed482167f7..13c56e45cdbc 100644 --- a/drivers/thermal/imx_thermal.c +++ b/drivers/thermal/imx_thermal.c @@ -330,26 +330,29 @@ static int imx_change_mode(struct thermal_zone_device *tz, return 0; } -static int imx_set_trip_temp(struct thermal_zone_device *tz, int trip, +static int imx_set_trip_temp(struct thermal_zone_device *tz, int trip_id, int temp) { struct imx_thermal_data *data = thermal_zone_device_priv(tz); + struct thermal_trip trip; int ret; ret = pm_runtime_resume_and_get(data->dev); if (ret < 0) return ret; + ret = __thermal_zone_get_trip(tz, trip_id, &trip); + if (ret) + return ret; + /* do not allow changing critical threshold */ - if (trip == IMX_TRIP_CRITICAL) + if (trip.type == THERMAL_TRIP_CRITICAL) return -EPERM; /* do not allow passive to be set higher than critical */ if (temp < 0 || temp > trips[IMX_TRIP_CRITICAL].temperature) return -EINVAL; - trips[IMX_TRIP_PASSIVE].temperature = temp; - imx_set_alarm_temp(data, temp); pm_runtime_put(data->dev);