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,
Kunihiko Hayashi <hayashi.kunihiko@socionext.com>,
Amit Kucheria <amitk@kernel.org>,
Masami Hiramatsu <mhiramat@kernel.org>,
linux-arm-kernel@lists.infradead.org (moderated
list:ARM/UNIPHIER ARCHITECTURE)
Subject: [PATCH v4 12/30] thermal/drivers/uniphier: Use generic thermal_zone_get_trip() function
Date: Wed, 21 Sep 2022 11:42:25 +0200 [thread overview]
Message-ID: <20220921094244.606948-13-daniel.lezcano@linaro.org> (raw)
In-Reply-To: <20220921094244.606948-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>
Reviewed-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
---
drivers/thermal/uniphier_thermal.c | 27 ++++++++++++---------------
1 file changed, 12 insertions(+), 15 deletions(-)
diff --git a/drivers/thermal/uniphier_thermal.c b/drivers/thermal/uniphier_thermal.c
index 4111d99ef50e..277ae300c5b1 100644
--- a/drivers/thermal/uniphier_thermal.c
+++ b/drivers/thermal/uniphier_thermal.c
@@ -248,8 +248,7 @@ static int uniphier_tm_probe(struct platform_device *pdev)
struct regmap *regmap;
struct device_node *parent;
struct uniphier_tm_dev *tdev;
- const struct thermal_trip *trips;
- int i, ret, irq, ntrips, crit_temp = INT_MAX;
+ int i, ret, irq, crit_temp = INT_MAX;
tdev = devm_kzalloc(dev, sizeof(*tdev), GFP_KERNEL);
if (!tdev)
@@ -296,20 +295,18 @@ static int uniphier_tm_probe(struct platform_device *pdev)
return PTR_ERR(tdev->tz_dev);
}
- /* get trip points */
- trips = of_thermal_get_trip_points(tdev->tz_dev);
- ntrips = of_thermal_get_ntrips(tdev->tz_dev);
- if (ntrips > ALERT_CH_NUM) {
- dev_err(dev, "thermal zone has too many trips\n");
- return -E2BIG;
- }
-
/* set alert temperatures */
- for (i = 0; i < ntrips; i++) {
- if (trips[i].type == THERMAL_TRIP_CRITICAL &&
- trips[i].temperature < crit_temp)
- crit_temp = trips[i].temperature;
- uniphier_tm_set_alert(tdev, i, trips[i].temperature);
+ for (i = 0; i < thermal_zone_get_num_trips(tdev->tz_dev); i++) {
+ struct thermal_trip trip;
+
+ ret = thermal_zone_get_trip(tdev->tz_dev, i, &trip);
+ if (ret)
+ return ret;
+
+ if (trip.type == THERMAL_TRIP_CRITICAL &&
+ trip.temperature < crit_temp)
+ crit_temp = trip.temperature;
+ uniphier_tm_set_alert(tdev, i, trip.temperature);
tdev->alert_en[i] = true;
}
if (crit_temp > CRITICAL_TEMP_LIMIT) {
--
2.34.1
next prev parent reply other threads:[~2022-09-21 9:44 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-21 9:42 [PATCH v4 00/30] Rework the trip points creation Daniel Lezcano
2022-09-21 9:42 ` [PATCH v4 01/30] thermal/core: Add a generic thermal_zone_get_trip() function Daniel Lezcano
2022-09-23 13:54 ` Zhang Rui
[not found] ` <CGME20220923221936eucas1p1e01148605c9aaf27d8d71969feb99144@eucas1p1.samsung.com>
2022-09-23 22:19 ` Marek Szyprowski
2022-09-24 17:46 ` Daniel Lezcano
2022-09-21 9:42 ` [PATCH v4 02/30] thermal/sysfs: Do not make get_trip_hyst optional Daniel Lezcano
2022-09-23 14:19 ` Zhang Rui
2022-09-26 12:55 ` Daniel Lezcano
2022-09-21 9:42 ` [PATCH v4 03/30] thermal/core: Add a generic thermal_zone_set_trip() function Daniel Lezcano
2022-09-23 14:21 ` Zhang Rui
2022-09-21 9:42 ` [PATCH v4 04/30] thermal/core: Add a generic thermal_zone_get_crit_temp() function Daniel Lezcano
2022-09-23 14:22 ` Zhang Rui
2022-09-21 9:42 ` [PATCH v4 05/30] thermal/core/governors: Use thermal_zone_get_trip() instead of ops functions Daniel Lezcano
2022-09-23 14:25 ` Zhang Rui
2022-09-23 14:49 ` Lukasz Luba
2022-09-21 9:42 ` [PATCH v4 06/30] thermal/of: Use generic thermal_zone_get_trip() function Daniel Lezcano
2022-09-21 9:42 ` [PATCH v4 07/30] thermal/of: Remove unused functions Daniel Lezcano
2022-09-21 9:42 ` [PATCH v4 08/30] thermal/drivers/exynos: Use generic thermal_zone_get_trip() function Daniel Lezcano
2022-09-21 9:42 ` [PATCH v4 09/30] thermal/drivers/exynos: of_thermal_get_ntrips() Daniel Lezcano
2022-09-21 9:42 ` [PATCH v4 10/30] thermal/drivers/exynos: Replace of_thermal_is_trip_valid() by thermal_zone_get_trip() Daniel Lezcano
2022-09-21 15:24 ` Krzysztof Kozlowski
[not found] ` <CGME20220923140903eucas1p180002df0deb308d5148cc6004aef7efe@eucas1p1.samsung.com>
2022-09-23 14:09 ` Marek Szyprowski
2022-09-23 17:40 ` Daniel Lezcano
2022-09-23 22:02 ` Marek Szyprowski
2022-09-21 9:42 ` [PATCH v4 11/30] thermal/drivers/tegra: Use generic thermal_zone_get_trip() function Daniel Lezcano
2022-09-21 9:42 ` Daniel Lezcano [this message]
2022-09-21 9:42 ` [PATCH v4 13/30] thermal/drivers/hisi: " Daniel Lezcano
2022-09-21 9:42 ` [PATCH v4 14/30] thermal/drivers/qcom: " Daniel Lezcano
2022-09-21 9:42 ` [PATCH v4 15/30] thermal/drivers/armada: " Daniel Lezcano
2022-09-21 9:42 ` [PATCH v4 16/30] thermal/drivers/rcar_gen3: Use the generic function to get the number of trips Daniel Lezcano
2022-09-21 9:42 ` [PATCH v4 17/30] thermal/of: Remove of_thermal_get_ntrips() Daniel Lezcano
2022-09-21 9:42 ` [PATCH v4 18/30] thermal/of: Remove of_thermal_is_trip_valid() Daniel Lezcano
2022-09-21 9:42 ` [PATCH v4 19/30] thermal/of: Remove of_thermal_set_trip_hyst() Daniel Lezcano
2022-09-21 9:42 ` [PATCH v4 20/30] thermal/of: Remove of_thermal_get_crit_temp() Daniel Lezcano
2022-09-21 9:42 ` [PATCH v4 21/30] thermal/drivers/st: Use generic trip points Daniel Lezcano
2022-09-21 9:42 ` [PATCH v4 22/30] thermal/drivers/imx: Use generic thermal_zone_get_trip() function Daniel Lezcano
2022-09-21 9:42 ` [PATCH v4 23/30] thermal/drivers/rcar: " Daniel Lezcano
2022-09-21 9:42 ` [PATCH v4 24/30] thermal/drivers/broadcom: " Daniel Lezcano
2022-09-21 9:42 ` [PATCH v4 25/30] thermal/drivers/da9062: " Daniel Lezcano
2022-09-21 9:42 ` [PATCH v4 26/30] thermal/drivers/ti: Remove unused macros ti_thermal_get_trip_value() / ti_thermal_trip_is_valid() Daniel Lezcano
2022-09-21 9:42 ` [PATCH v4 27/30] thermal/drivers/acerhdf: Use generic thermal_zone_get_trip() function Daniel Lezcano
2022-09-21 9:42 ` [PATCH v4 28/30] thermal/drivers/cxgb4: " Daniel Lezcano
2022-09-21 9:42 ` [PATCH v4 29/30] thermal/intel/int340x: Replace parameter to simplify Daniel Lezcano
2022-09-21 9:42 ` [PATCH v4 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=20220921094244.606948-13-daniel.lezcano@linaro.org \
--to=daniel.lezcano@linaro.org \
--cc=amitk@kernel.org \
--cc=hayashi.kunihiko@socionext.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=mhiramat@kernel.org \
--cc=rafael@kernel.org \
--cc=rui.zhang@intel.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).