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 v5 24/30] thermal/drivers/broadcom: Use generic thermal_zone_get_trip() function
Date: Mon, 26 Sep 2022 16:05:58 +0200 [thread overview]
Message-ID: <20220926140604.4173723-25-daniel.lezcano@linaro.org> (raw)
In-Reply-To: <20220926140604.4173723-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
next prev parent reply other threads:[~2022-09-26 15:21 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-26 14:05 [PATCH v5 00/30] Rework the trip points creation Daniel Lezcano
2022-09-26 14:05 ` [PATCH v5 01/30] thermal/core: Add a generic thermal_zone_get_trip() function Daniel Lezcano
2022-09-26 19:01 ` Rafael J. Wysocki
2022-09-26 14:05 ` [PATCH v5 02/30] thermal/sysfs: Do not make get_trip_hyst optional Daniel Lezcano
2022-09-26 19:16 ` Rafael J. Wysocki
2022-09-26 14:05 ` [PATCH v5 03/30] thermal/core: Add a generic thermal_zone_set_trip() function Daniel Lezcano
2022-09-26 19:25 ` Rafael J. Wysocki
2022-09-26 22:11 ` Daniel Lezcano
2022-09-27 10:38 ` Rafael J. Wysocki
2022-09-27 12:20 ` Daniel Lezcano
2022-09-26 14:05 ` [PATCH v5 04/30] thermal/core: Add a generic thermal_zone_get_crit_temp() function Daniel Lezcano
2022-09-26 19:27 ` Rafael J. Wysocki
2022-09-26 14:05 ` [PATCH v5 05/30] thermal/core/governors: Use thermal_zone_get_trip() instead of ops functions Daniel Lezcano
2022-09-26 19:34 ` Rafael J. Wysocki
2022-09-26 22:15 ` Daniel Lezcano
2022-09-27 11:08 ` Rafael J. Wysocki
2022-09-26 14:05 ` [PATCH v5 06/30] thermal/of: Use generic thermal_zone_get_trip() function Daniel Lezcano
2022-09-26 14:05 ` [PATCH v5 07/30] thermal/of: Remove unused functions Daniel Lezcano
2022-09-26 14:05 ` [PATCH v5 08/30] thermal/drivers/exynos: Use generic thermal_zone_get_trip() function Daniel Lezcano
2022-09-26 14:05 ` [PATCH v5 09/30] thermal/drivers/exynos: of_thermal_get_ntrips() Daniel Lezcano
2022-09-26 14:05 ` [PATCH v5 10/30] thermal/drivers/exynos: Replace of_thermal_is_trip_valid() by thermal_zone_get_trip() Daniel Lezcano
2022-09-26 14:05 ` [PATCH v5 11/30] thermal/drivers/tegra: Use generic thermal_zone_get_trip() function Daniel Lezcano
2022-09-26 14:05 ` [PATCH v5 12/30] thermal/drivers/uniphier: " Daniel Lezcano
2022-09-26 14:05 ` [PATCH v5 13/30] thermal/drivers/hisi: " Daniel Lezcano
2022-09-26 14:05 ` [PATCH v5 14/30] thermal/drivers/qcom: " Daniel Lezcano
2022-09-26 14:05 ` [PATCH v5 15/30] thermal/drivers/armada: " Daniel Lezcano
2022-09-26 14:05 ` [PATCH v5 16/30] thermal/drivers/rcar_gen3: Use the generic function to get the number of trips Daniel Lezcano
2022-09-26 14:05 ` [PATCH v5 17/30] thermal/of: Remove of_thermal_get_ntrips() Daniel Lezcano
2022-09-26 14:05 ` [PATCH v5 18/30] thermal/of: Remove of_thermal_is_trip_valid() Daniel Lezcano
2022-09-26 14:05 ` [PATCH v5 19/30] thermal/of: Remove of_thermal_set_trip_hyst() Daniel Lezcano
2022-09-26 14:05 ` [PATCH v5 20/30] thermal/of: Remove of_thermal_get_crit_temp() Daniel Lezcano
2022-09-26 14:05 ` [PATCH v5 21/30] thermal/drivers/st: Use generic trip points Daniel Lezcano
2022-09-26 14:05 ` [PATCH v5 22/30] thermal/drivers/imx: Use generic thermal_zone_get_trip() function Daniel Lezcano
2022-09-26 14:05 ` [PATCH v5 23/30] thermal/drivers/rcar: " Daniel Lezcano
2022-09-26 14:05 ` Daniel Lezcano [this message]
2022-09-26 14:05 ` [PATCH v5 25/30] thermal/drivers/da9062: " Daniel Lezcano
2022-09-26 14:06 ` [PATCH v5 26/30] thermal/drivers/ti: Remove unused macros ti_thermal_get_trip_value() / ti_thermal_trip_is_valid() Daniel Lezcano
2022-09-26 14:06 ` [PATCH v5 27/30] thermal/drivers/acerhdf: Use generic thermal_zone_get_trip() function Daniel Lezcano
2022-09-26 14:06 ` [PATCH v5 28/30] thermal/drivers/cxgb4: " Daniel Lezcano
2022-09-26 14:06 ` [PATCH v5 29/30] thermal/intel/int340x: Replace parameter to simplify Daniel Lezcano
2022-09-26 17:05 ` Nathan Chancellor
2022-09-26 21:33 ` Daniel Lezcano
2022-09-26 14:06 ` [PATCH v5 30/30] thermal/drivers/intel: Use generic thermal_zone_get_trip() function Daniel Lezcano
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=20220926140604.4173723-25-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).