All of lore.kernel.org
 help / color / mirror / Atom feed
From: Daniel Lezcano <daniel.lezcano@linaro.org>
To: daniel.lezcano@linaro.org, rafael@kernel.org
Cc: linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org,
	rui.zhang@intel.com, Amit Kucheria <amitk@kernel.org>,
	Florian Fainelli <f.fainelli@gmail.com>,
	Broadcom internal kernel review list 
	<bcm-kernel-feedback-list@broadcom.com>,
	Ray Jui <rjui@broadcom.com>,
	Scott Branden <sbranden@broadcom.com>,
	linux-rpi-kernel@lists.infradead.org (moderated list:BROADCOM
	BCM2711/BCM2835 ARM ARCHITECTURE),
	linux-arm-kernel@lists.infradead.org (moderated list:BROADCOM
	BCM2711/BCM2835 ARM ARCHITECTURE)
Subject: [PATCH v6 23/29] thermal/drivers/broadcom: Use generic thermal_zone_get_trip() function
Date: Tue, 27 Sep 2022 16:32:33 +0200	[thread overview]
Message-ID: <20220927143239.376737-24-daniel.lezcano@linaro.org> (raw)
In-Reply-To: <20220927143239.376737-1-daniel.lezcano@linaro.org>

The thermal framework gives the possibility to register the trip
points with the thermal zone. When that is done, no get_trip_* ops are
needed and they can be removed.

Convert ops content logic into generic trip points and register them with the
thermal zone.

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
 drivers/thermal/broadcom/bcm2835_thermal.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/thermal/broadcom/bcm2835_thermal.c b/drivers/thermal/broadcom/bcm2835_thermal.c
index 2c67841a1115..5485e59d03a9 100644
--- a/drivers/thermal/broadcom/bcm2835_thermal.c
+++ b/drivers/thermal/broadcom/bcm2835_thermal.c
@@ -18,6 +18,7 @@
 #include <linux/platform_device.h>
 #include <linux/thermal.h>
 
+#include "../thermal_core.h"
 #include "../thermal_hwmon.h"
 
 #define BCM2835_TS_TSENSCTL			0x00
@@ -224,7 +225,8 @@ static int bcm2835_thermal_probe(struct platform_device *pdev)
 	 */
 	val = readl(data->regs + BCM2835_TS_TSENSCTL);
 	if (!(val & BCM2835_TS_TSENSCTL_RSTB)) {
-		int trip_temp, offset, slope;
+		struct thermal_trip trip;
+		int offset, slope;
 
 		slope = thermal_zone_get_slope(tz);
 		offset = thermal_zone_get_offset(tz);
@@ -232,7 +234,7 @@ static int bcm2835_thermal_probe(struct platform_device *pdev)
 		 * For now we deal only with critical, otherwise
 		 * would need to iterate
 		 */
-		err = tz->ops->get_trip_temp(tz, 0, &trip_temp);
+		err = thermal_zone_get_trip(tz, 0, &trip);
 		if (err < 0) {
 			dev_err(&pdev->dev,
 				"Not able to read trip_temp: %d\n",
@@ -249,7 +251,7 @@ static int bcm2835_thermal_probe(struct platform_device *pdev)
 		val |= (0xFE << BCM2835_TS_TSENSCTL_RSTDELAY_SHIFT);
 
 		/*  trip_adc value from info */
-		val |= bcm2835_thermal_temp2adc(trip_temp,
+		val |= bcm2835_thermal_temp2adc(trip.temperature,
 						offset,
 						slope)
 			<< BCM2835_TS_TSENSCTL_THOLD_SHIFT;
-- 
2.34.1


WARNING: multiple messages have this Message-ID (diff)
From: Daniel Lezcano <daniel.lezcano@linaro.org>
To: daniel.lezcano@linaro.org, rafael@kernel.org
Cc: linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org,
	rui.zhang@intel.com, Amit Kucheria <amitk@kernel.org>,
	Florian Fainelli <f.fainelli@gmail.com>,
	Broadcom internal kernel review list
	<bcm-kernel-feedback-list@broadcom.com>,
	Ray Jui <rjui@broadcom.com>,
	Scott Branden <sbranden@broadcom.com>,
	linux-rpi-kernel@lists.infradead.org (moderated list:BROADCOM
	BCM2711/BCM2835 ARM ARCHITECTURE),
	linux-arm-kernel@lists.infradead.org (moderated list:BROADCOM
	BCM2711/BCM2835 ARM ARCHITECTURE)
Subject: [PATCH v6 23/29] thermal/drivers/broadcom: Use generic thermal_zone_get_trip() function
Date: Tue, 27 Sep 2022 16:32:33 +0200	[thread overview]
Message-ID: <20220927143239.376737-24-daniel.lezcano@linaro.org> (raw)
In-Reply-To: <20220927143239.376737-1-daniel.lezcano@linaro.org>

The thermal framework gives the possibility to register the trip
points with the thermal zone. When that is done, no get_trip_* ops are
needed and they can be removed.

Convert ops content logic into generic trip points and register them with the
thermal zone.

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
 drivers/thermal/broadcom/bcm2835_thermal.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/thermal/broadcom/bcm2835_thermal.c b/drivers/thermal/broadcom/bcm2835_thermal.c
index 2c67841a1115..5485e59d03a9 100644
--- a/drivers/thermal/broadcom/bcm2835_thermal.c
+++ b/drivers/thermal/broadcom/bcm2835_thermal.c
@@ -18,6 +18,7 @@
 #include <linux/platform_device.h>
 #include <linux/thermal.h>
 
+#include "../thermal_core.h"
 #include "../thermal_hwmon.h"
 
 #define BCM2835_TS_TSENSCTL			0x00
@@ -224,7 +225,8 @@ static int bcm2835_thermal_probe(struct platform_device *pdev)
 	 */
 	val = readl(data->regs + BCM2835_TS_TSENSCTL);
 	if (!(val & BCM2835_TS_TSENSCTL_RSTB)) {
-		int trip_temp, offset, slope;
+		struct thermal_trip trip;
+		int offset, slope;
 
 		slope = thermal_zone_get_slope(tz);
 		offset = thermal_zone_get_offset(tz);
@@ -232,7 +234,7 @@ static int bcm2835_thermal_probe(struct platform_device *pdev)
 		 * For now we deal only with critical, otherwise
 		 * would need to iterate
 		 */
-		err = tz->ops->get_trip_temp(tz, 0, &trip_temp);
+		err = thermal_zone_get_trip(tz, 0, &trip);
 		if (err < 0) {
 			dev_err(&pdev->dev,
 				"Not able to read trip_temp: %d\n",
@@ -249,7 +251,7 @@ static int bcm2835_thermal_probe(struct platform_device *pdev)
 		val |= (0xFE << BCM2835_TS_TSENSCTL_RSTDELAY_SHIFT);
 
 		/*  trip_adc value from info */
-		val |= bcm2835_thermal_temp2adc(trip_temp,
+		val |= bcm2835_thermal_temp2adc(trip.temperature,
 						offset,
 						slope)
 			<< BCM2835_TS_TSENSCTL_THOLD_SHIFT;
-- 
2.34.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2022-09-27 14:35 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-27 14:32 [PATCH v5 00/30] Rework the trip points creation Daniel Lezcano
2022-09-27 14:32 ` [PATCH v6 01/29] thermal/core: Add a generic thermal_zone_get_trip() function Daniel Lezcano
2022-09-27 14:32 ` [PATCH v6 02/29] thermal/sysfs: Always expose hysteresis attributes Daniel Lezcano
2022-09-27 14:32 ` [PATCH v6 03/29] thermal/core: Add a generic thermal_zone_set_trip() function Daniel Lezcano
2022-09-27 14:32 ` [PATCH v6 04/29] thermal/core/governors: Use thermal_zone_get_trip() instead of ops functions Daniel Lezcano
2022-09-27 14:32 ` [PATCH v6 05/29] thermal/of: Use generic thermal_zone_get_trip() function Daniel Lezcano
2022-09-27 14:32 ` [PATCH v6 06/29] thermal/of: Remove unused functions Daniel Lezcano
2022-09-27 14:32 ` [PATCH v6 07/29] thermal/drivers/exynos: Use generic thermal_zone_get_trip() function Daniel Lezcano
2022-09-27 14:32   ` Daniel Lezcano
2022-09-27 14:32 ` [PATCH v6 08/29] thermal/drivers/exynos: of_thermal_get_ntrips() Daniel Lezcano
2022-09-27 14:32   ` Daniel Lezcano
2022-09-27 14:32 ` [PATCH v6 09/29] thermal/drivers/exynos: Replace of_thermal_is_trip_valid() by thermal_zone_get_trip() Daniel Lezcano
2022-09-27 14:32   ` Daniel Lezcano
2022-09-27 14:32 ` [PATCH v6 10/29] thermal/drivers/tegra: Use generic thermal_zone_get_trip() function Daniel Lezcano
2022-09-27 14:32 ` [PATCH v6 11/29] thermal/drivers/uniphier: " Daniel Lezcano
2022-09-27 14:32   ` Daniel Lezcano
2022-09-27 14:32 ` [PATCH v6 12/29] thermal/drivers/hisi: " Daniel Lezcano
2022-09-27 14:32 ` [PATCH v6 13/29] thermal/drivers/qcom: " Daniel Lezcano
2022-09-27 14:32 ` [PATCH v6 14/29] thermal/drivers/armada: " Daniel Lezcano
2022-09-27 14:32 ` [PATCH v6 15/29] thermal/drivers/rcar_gen3: Use the generic function to get the number of trips Daniel Lezcano
2022-09-27 14:32 ` [PATCH v6 16/29] thermal/of: Remove of_thermal_get_ntrips() Daniel Lezcano
2022-09-27 14:32 ` [PATCH v6 17/29] thermal/of: Remove of_thermal_is_trip_valid() Daniel Lezcano
2022-09-27 14:32 ` [PATCH v6 18/29] thermal/of: Remove of_thermal_set_trip_hyst() Daniel Lezcano
2022-09-27 14:32 ` [PATCH v6 19/29] thermal/of: Remove of_thermal_get_crit_temp() Daniel Lezcano
2022-09-27 14:32 ` [PATCH v6 20/29] thermal/drivers/st: Use generic trip points Daniel Lezcano
2022-09-27 14:32 ` [PATCH v6 21/29] thermal/drivers/imx: Use generic thermal_zone_get_trip() function Daniel Lezcano
2022-09-27 14:32   ` Daniel Lezcano
2022-09-27 14:32 ` [PATCH v6 22/29] thermal/drivers/rcar: " Daniel Lezcano
2022-09-27 14:32 ` Daniel Lezcano [this message]
2022-09-27 14:32   ` [PATCH v6 23/29] thermal/drivers/broadcom: " Daniel Lezcano
2022-09-27 14:32 ` [PATCH v6 24/29] thermal/drivers/da9062: " Daniel Lezcano
2022-09-27 14:32 ` [PATCH v6 25/29] thermal/drivers/ti: Remove unused macros ti_thermal_get_trip_value() / ti_thermal_trip_is_valid() Daniel Lezcano
2022-09-27 14:32 ` [PATCH v6 26/29] thermal/drivers/acerhdf: Use generic thermal_zone_get_trip() function Daniel Lezcano
2022-09-27 14:32 ` [PATCH v6 27/29] thermal/drivers/cxgb4: " Daniel Lezcano
2022-09-27 14:32 ` [PATCH v6 28/29] thermal/intel/int340x: Replace parameter to simplify Daniel Lezcano
2022-09-27 14:32 ` [PATCH v6 29/29] thermal/drivers/intel: Use generic thermal_zone_get_trip() function Daniel Lezcano
2022-09-27 14:35 ` [PATCH v5 00/30] Rework the trip points creation Dmitry Baryshkov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220927143239.376737-24-daniel.lezcano@linaro.org \
    --to=daniel.lezcano@linaro.org \
    --cc=amitk@kernel.org \
    --cc=bcm-kernel-feedback-list@broadcom.com \
    --cc=f.fainelli@gmail.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=linux-rpi-kernel@lists.infradead.org \
    --cc=rafael@kernel.org \
    --cc=rjui@broadcom.com \
    --cc=rui.zhang@intel.com \
    --cc=sbranden@broadcom.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.