From patchwork Tue Jul 16 17:34:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Rapha=C3=ABl_Gallais-Pou?= X-Patchwork-Id: 13734714 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7E665C3DA59 for ; Tue, 16 Jul 2024 17:36:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=mFZzo+h40ZkOiMih2IEE7mwoxCHvaz4i8bbYlqWEClA=; b=gujsWmwW5+sofwicUBM0xwCN29 GEeJCQ1iwGn/bWPr7agunKC6W6RLZK5Hb5XFVLf5kTRcx4+hoDfnrwkjiNPGF0EXi5noDHKnPTJqf 8JwUORPgySc5cNX1PCSS0YWqK5gH0nw5L3ux5cqI3x3lq9dt/lqm/z0roEUzhDclGTpNZxLTDAUIe k0C4JfkHpUqEgnzbZLiPplS97Dp5hDfLfr35fg3hN+hd2dfLsLjs+celURZWiuUOUFKPYj6GUJoGn kF6naEPUPPWwImyTOQAz+Pg9D7/qBiSUQzu2vHRvuaBjxKFKtqOHCoLjcD7XO0TBTSJp9nHhJwBYc YfYZ8w8w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sTm5y-0000000B9xb-3QiN; Tue, 16 Jul 2024 17:36:10 +0000 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sTm55-0000000B9fm-3B32 for linux-arm-kernel@lists.infradead.org; Tue, 16 Jul 2024 17:35:17 +0000 Received: by mail-wr1-x429.google.com with SMTP id ffacd0b85a97d-367ab50a07aso3660978f8f.0 for ; Tue, 16 Jul 2024 10:35:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721151314; x=1721756114; darn=lists.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=mFZzo+h40ZkOiMih2IEE7mwoxCHvaz4i8bbYlqWEClA=; b=I7J53Fxcp1JhsLLMlXbzvleWVp/Lbh3huhhMU4luVEaa3wnQwZMZCk51+tXN2R/Rtm m/3AJtxJUhB3VX0gtniICiUvQ5ZOKPhqH8T1R1NtiJcHPyM31riqAh7BkHztVwAWKkOS FBPlNU1Cxgg5U21zSHgTS/K3WlHHANXl0zkb2AWBHkttWcYJ0rY0AmxIX4+ZC12aHlr6 ohNrq30qImTXy8bUCW8srLFd2cbexhbfjWitc0int5pRYCo3EBPBSp16z+9FbjhnsNKC IBT2NnTdsXfO2fOQVPif48tf6g5kVxRdJwB1Ae+9VvCFfkDj/cu71mSa+kd/fsDG3JJI 0YDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721151314; x=1721756114; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=mFZzo+h40ZkOiMih2IEE7mwoxCHvaz4i8bbYlqWEClA=; b=ZzEomxQqHCZQD6NI4Nhz6+GVEi98IQZll+Xc0sGw6zuTTEtz532oO6QuCbLwXmzi3r 9LbR5cKr3TGstRFtpWO1gxxxHisiKRSh5ISIve0433GiDhclHH2g5xKom/b3ZwGLFfKC GRRw1AxNrTQ3fVaeZQvqJiGazo8z029+rqFti/IRAz68xcZuP6d8MhB+VHE9NbSnIqsB xrz2+m/cxfRLCEBoCXLz+XRjMSLET/z8/tUD5V0wfjeKwE7Upj17+pboIDxzo+UEIwlc 69qawqDhsPFRcNGKaOZG8iuKO+p2ska3qKOkF4eOn+75nvrKAUhAlxaYSIGnBFxPCVoe ZOGQ== X-Forwarded-Encrypted: i=1; AJvYcCXz+W8owBstZkdzTR3yiCZ/6G378rA5ZaeHfUp7F2ZhOXQkzgJlULz7ortYApn33WCRZsc3yVA2+RhyO8NzTPIjNLjd6jlm2euxRfUX2/k3YBP6kPY= X-Gm-Message-State: AOJu0YwcHUqtp3D2adgkSrBWBrzshCTnxBSKQN7K0LmekSK9EJGgRedB ZMeM5lWrzNuU5cOiX1aY3uLrYYL/ToriIpo0uC8auRLhRKcWaPlJFnYzXA== X-Google-Smtp-Source: AGHT+IE70zhsNBUYOAewbvXHcYgepuMa8i+6KzIjuE7KgPVIgmBQVK7/cIQLRs1F0enKt0xhxVITpg== X-Received: by 2002:a5d:588d:0:b0:367:958e:9822 with SMTP id ffacd0b85a97d-36825f715c0mr2543892f8f.14.1721151313262; Tue, 16 Jul 2024 10:35:13 -0700 (PDT) Received: from localhost ([2001:861:3385:e20:6384:4cf:52c5:3194]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4279f27877dsm167381895e9.26.2024.07.16.10.35.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Jul 2024 10:35:13 -0700 (PDT) From: Raphael Gallais-Pou Date: Tue, 16 Jul 2024 19:34:52 +0200 Subject: [PATCH v4 2/2] thermal: sti: depend on THERMAL_OF subsystem MIME-Version: 1.0 Message-Id: <20240716-thermal-v4-2-947b327e165c@gmail.com> References: <20240716-thermal-v4-0-947b327e165c@gmail.com> In-Reply-To: <20240716-thermal-v4-0-947b327e165c@gmail.com> To: "Rafael J. Wysocki" , Daniel Lezcano , Zhang Rui , Lukasz Luba , Maxime Coquelin , Alexandre Torgue , Patrice Chotard , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org X-Mailer: b4 0.14.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240716_103515_833193_C05DC6DA X-CRM114-Status: GOOD ( 15.77 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Switch to thermal_of_zone to handle thermal-zones. Replace thermal_zone_device_register() by devm_thermal_of_zone_register() and remove ops st_thermal_get_trip_type, st_thermal_get_trip_temp. Signed-off-by: Raphael Gallais-Pou --- Changes in v4: - Optimize dependencies - Do not return devm_* exit code Changes in v3: - Fix unmet dependency when building with ARM64 compiler https://lore.kernel.org/lkml/202406270605.qodaWd4n-lkp@intel.com/ - Remove no more used polling_delay variable detected by kernel robot https://lore.kernel.org/lkml/202406270530.kN5wIswi-lkp@intel.com/ Changes in v2: - Remove unused struct thermal_trip trip --- drivers/thermal/Kconfig | 2 +- drivers/thermal/st/st_thermal.c | 28 +++++++++++----------------- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig index ed16897584b4..b6b916e7e294 100644 --- a/drivers/thermal/Kconfig +++ b/drivers/thermal/Kconfig @@ -429,7 +429,7 @@ source "drivers/thermal/samsung/Kconfig" endmenu menu "STMicroelectronics thermal drivers" -depends on (ARCH_STI || ARCH_STM32) && OF +depends on (ARCH_STI || ARCH_STM32) && THERMAL_OF source "drivers/thermal/st/Kconfig" endmenu diff --git a/drivers/thermal/st/st_thermal.c b/drivers/thermal/st/st_thermal.c index 5f33543a3a54..a14a37d54698 100644 --- a/drivers/thermal/st/st_thermal.c +++ b/drivers/thermal/st/st_thermal.c @@ -12,6 +12,7 @@ #include #include "st_thermal.h" +#include "../thermal_hwmon.h" /* The Thermal Framework expects millidegrees */ #define mcelsius(temp) ((temp) * 1000) @@ -135,8 +136,6 @@ static struct thermal_zone_device_ops st_tz_ops = { .get_temp = st_thermal_get_temp, }; -static struct thermal_trip trip; - int st_thermal_register(struct platform_device *pdev, const struct of_device_id *st_thermal_of_match) { @@ -145,7 +144,6 @@ int st_thermal_register(struct platform_device *pdev, struct device_node *np = dev->of_node; const struct of_device_id *match; - int polling_delay; int ret; if (!np) { @@ -197,29 +195,24 @@ int st_thermal_register(struct platform_device *pdev, if (ret) goto sensor_off; - polling_delay = sensor->ops->register_enable_irq ? 0 : 1000; - - trip.temperature = sensor->cdata->crit_temp; - trip.type = THERMAL_TRIP_CRITICAL; - sensor->thermal_dev = - thermal_zone_device_register_with_trips(dev_name(dev), &trip, 1, sensor, - &st_tz_ops, NULL, 0, polling_delay); + devm_thermal_of_zone_register(dev, 0, sensor, &st_tz_ops); if (IS_ERR(sensor->thermal_dev)) { - dev_err(dev, "failed to register thermal zone device\n"); + dev_err(dev, "failed to register thermal of zone\n"); ret = PTR_ERR(sensor->thermal_dev); goto sensor_off; } - ret = thermal_zone_device_enable(sensor->thermal_dev); - if (ret) - goto tzd_unregister; platform_set_drvdata(pdev, sensor); + /* + * devm_thermal_of_zone_register() doesn't enable hwmon by default + * Enable it here + */ + devm_thermal_add_hwmon_sysfs(dev, sensor->thermal_dev); + return 0; -tzd_unregister: - thermal_zone_device_unregister(sensor->thermal_dev); sensor_off: st_thermal_sensor_off(sensor); @@ -232,7 +225,8 @@ void st_thermal_unregister(struct platform_device *pdev) struct st_thermal_sensor *sensor = platform_get_drvdata(pdev); st_thermal_sensor_off(sensor); - thermal_zone_device_unregister(sensor->thermal_dev); + thermal_remove_hwmon_sysfs(sensor->thermal_dev); + devm_thermal_of_zone_unregister(sensor->dev, sensor->thermal_dev); } EXPORT_SYMBOL_GPL(st_thermal_unregister);