From: "thermal-bot for Daniel Lezcano" <tip-bot2@linutronix.de>
To: linux-pm@vger.kernel.org
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>,
rui.zhang@intel.com, amitk@kernel.org
Subject: [thermal: thermal/next] thermal/drivers/armada: Use generic thermal_zone_get_trip() function
Date: Fri, 09 Dec 2022 15:26:34 -0000 [thread overview]
Message-ID: <167059959441.4906.13766676550501587988.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20221003092602.1323944-15-daniel.lezcano@linaro.org>
The following commit has been merged into the thermal/next branch of thermal:
Commit-ID: 79162ca505adc1cf8d44474c349e27da9813908d
Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git//79162ca505adc1cf8d44474c349e27da9813908d
Author: Daniel Lezcano <daniel.lezcano@linaro.org>
AuthorDate: Mon, 03 Oct 2022 11:25:47 +02:00
Committer: Daniel Lezcano <daniel.lezcano@kernel.org>
CommitterDate: Thu, 08 Dec 2022 14:30:42 +01:00
thermal/drivers/armada: Use generic thermal_zone_get_trip() function
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>
Link: https://lore.kernel.org/r/20221003092602.1323944-15-daniel.lezcano@linaro.org
---
drivers/thermal/armada_thermal.c | 37 +++++++++++++++----------------
1 file changed, 19 insertions(+), 18 deletions(-)
diff --git a/drivers/thermal/armada_thermal.c b/drivers/thermal/armada_thermal.c
index 52d63b3..b28695a 100644
--- a/drivers/thermal/armada_thermal.c
+++ b/drivers/thermal/armada_thermal.c
@@ -785,33 +785,34 @@ static int armada_configure_overheat_int(struct armada_thermal_priv *priv,
int sensor_id)
{
/* Retrieve the critical trip point to enable the overheat interrupt */
- const struct thermal_trip *trips = of_thermal_get_trip_points(tz);
+ struct thermal_trip trip;
int ret;
int i;
- if (!trips)
- return -EINVAL;
+ for (i = 0; i < thermal_zone_get_num_trips(tz); i++) {
- for (i = 0; i < of_thermal_get_ntrips(tz); i++)
- if (trips[i].type == THERMAL_TRIP_CRITICAL)
- break;
+ ret = thermal_zone_get_trip(tz, i, &trip);
+ if (ret)
+ return ret;
- if (i == of_thermal_get_ntrips(tz))
- return -EINVAL;
+ if (trip.type != THERMAL_TRIP_CRITICAL)
+ continue;
- ret = armada_select_channel(priv, sensor_id);
- if (ret)
- return ret;
+ ret = armada_select_channel(priv, sensor_id);
+ if (ret)
+ return ret;
- armada_set_overheat_thresholds(priv,
- trips[i].temperature,
- trips[i].hysteresis);
- priv->overheat_sensor = tz;
- priv->interrupt_source = sensor_id;
+ armada_set_overheat_thresholds(priv, trip.temperature,
+ trip.hysteresis);
+ priv->overheat_sensor = tz;
+ priv->interrupt_source = sensor_id;
- armada_enable_overheat_interrupt(priv);
+ armada_enable_overheat_interrupt(priv);
- return 0;
+ return 0;
+ }
+
+ return -EINVAL;
}
static int armada_thermal_probe(struct platform_device *pdev)
next prev parent reply other threads:[~2022-12-09 15:27 UTC|newest]
Thread overview: 77+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CGME20221003092704eucas1p2875c1f996dfd60a58f06cf986e02e8eb@eucas1p2.samsung.com>
2022-10-03 9:25 ` [PATCH v8 00/29] Rework the trip points creation Daniel Lezcano
2022-10-03 9:25 ` [PATCH v8 01/29] thermal/core: Add a generic thermal_zone_get_trip() function Daniel Lezcano
2022-12-09 15:26 ` [thermal: thermal/next] " thermal-bot for Daniel Lezcano
2023-03-12 12:14 ` [PATCH v8 01/29] " Ido Schimmel
2023-03-13 10:45 ` Daniel Lezcano
2023-03-13 12:12 ` Ido Schimmel
2022-10-03 9:25 ` [PATCH v8 02/29] thermal/sysfs: Always expose hysteresis attributes Daniel Lezcano
2022-12-09 15:26 ` [thermal: thermal/next] " thermal-bot for Daniel Lezcano
2022-10-03 9:25 ` [PATCH v8 03/29] thermal/core: Add a generic thermal_zone_set_trip() function Daniel Lezcano
2022-10-03 11:56 ` Rafael J. Wysocki
2022-12-09 15:26 ` [thermal: thermal/next] " thermal-bot for Daniel Lezcano
2022-10-03 9:25 ` [PATCH v8 04/29] thermal/core/governors: Use thermal_zone_get_trip() instead of ops functions Daniel Lezcano
2022-12-09 15:26 ` [thermal: thermal/next] " thermal-bot for Daniel Lezcano
2022-10-03 9:25 ` [PATCH v8 05/29] thermal/of: Use generic thermal_zone_get_trip() function Daniel Lezcano
2022-12-09 15:26 ` [thermal: thermal/next] " thermal-bot for Daniel Lezcano
2022-10-03 9:25 ` [PATCH v8 06/29] thermal/of: Remove unused functions Daniel Lezcano
2022-12-09 15:26 ` [thermal: thermal/next] " thermal-bot for Daniel Lezcano
2022-10-03 9:25 ` [PATCH v8 07/29] thermal/drivers/exynos: Use generic thermal_zone_get_trip() function Daniel Lezcano
2022-12-09 15:26 ` [thermal: thermal/next] " thermal-bot for Daniel Lezcano
2022-10-03 9:25 ` [PATCH v8 08/29] thermal/drivers/exynos: of_thermal_get_ntrips() Daniel Lezcano
2022-12-09 15:26 ` [thermal: thermal/next] " thermal-bot for Daniel Lezcano
2022-10-03 9:25 ` [PATCH v8 09/29] thermal/drivers/exynos: Replace of_thermal_is_trip_valid() by thermal_zone_get_trip() Daniel Lezcano
2022-12-09 15:26 ` [thermal: thermal/next] " thermal-bot for Daniel Lezcano
2022-10-03 9:25 ` [PATCH v8 10/29] thermal/drivers/tegra: Use generic thermal_zone_get_trip() function Daniel Lezcano
2022-12-09 15:26 ` [thermal: thermal/next] " thermal-bot for Daniel Lezcano
2022-10-03 9:25 ` [PATCH v8 11/29] thermal/drivers/uniphier: " Daniel Lezcano
2022-12-09 15:26 ` [thermal: thermal/next] " thermal-bot for Daniel Lezcano
2022-10-03 9:25 ` [PATCH v8 12/29] thermal/drivers/hisi: " Daniel Lezcano
2022-12-09 15:26 ` [thermal: thermal/next] " thermal-bot for Daniel Lezcano
2022-10-03 9:25 ` [PATCH v8 13/29] thermal/drivers/qcom: " Daniel Lezcano
2022-12-09 15:26 ` [thermal: thermal/next] " thermal-bot for Daniel Lezcano
2022-10-03 9:25 ` [PATCH v8 14/29] thermal/drivers/armada: " Daniel Lezcano
2022-12-09 15:26 ` thermal-bot for Daniel Lezcano [this message]
2022-10-03 9:25 ` [PATCH v8 15/29] thermal/drivers/rcar_gen3: Use the generic function to get the number of trips Daniel Lezcano
2022-12-09 15:26 ` [thermal: thermal/next] " thermal-bot for Daniel Lezcano
2022-10-03 9:25 ` [PATCH v8 16/29] thermal/of: Remove of_thermal_get_ntrips() Daniel Lezcano
2022-12-09 15:26 ` [thermal: thermal/next] " thermal-bot for Daniel Lezcano
2022-10-03 9:25 ` [PATCH v8 17/29] thermal/of: Remove of_thermal_is_trip_valid() Daniel Lezcano
2022-12-09 15:26 ` [thermal: thermal/next] " thermal-bot for Daniel Lezcano
2022-10-03 9:25 ` [PATCH v8 18/29] thermal/of: Remove of_thermal_set_trip_hyst() Daniel Lezcano
2022-12-09 15:26 ` [thermal: thermal/next] " thermal-bot for Daniel Lezcano
2022-10-03 9:25 ` [PATCH v8 19/29] thermal/of: Remove of_thermal_get_crit_temp() Daniel Lezcano
2022-10-03 12:50 ` Marek Szyprowski
2022-10-03 13:29 ` [PATCH] thermal/drivers/exynos: Fix NULL pointer dereference when getting the critical temp Daniel Lezcano
2022-10-03 13:40 ` Krzysztof Kozlowski
2022-10-03 13:50 ` Marek Szyprowski
2022-10-17 13:48 ` Marek Szyprowski
2022-10-17 14:14 ` Daniel Lezcano
2022-10-03 13:31 ` [PATCH v8 19/29] thermal/of: Remove of_thermal_get_crit_temp() Daniel Lezcano
2022-12-09 15:26 ` [thermal: thermal/next] " thermal-bot for Daniel Lezcano
2022-10-03 9:25 ` [PATCH v8 20/29] thermal/drivers/st: Use generic trip points Daniel Lezcano
2022-12-09 15:26 ` [thermal: thermal/next] " thermal-bot for Daniel Lezcano
2022-10-03 9:25 ` [PATCH v8 21/29] thermal/drivers/imx: Use generic thermal_zone_get_trip() function Daniel Lezcano
2022-12-09 15:26 ` [thermal: thermal/next] " thermal-bot for Daniel Lezcano
2022-10-03 9:25 ` [PATCH v8 22/29] thermal/drivers/rcar: " Daniel Lezcano
2022-12-09 15:26 ` [thermal: thermal/next] " thermal-bot for Daniel Lezcano
2022-10-03 9:25 ` [PATCH v8 23/29] thermal/drivers/broadcom: " Daniel Lezcano
2022-12-09 15:26 ` [thermal: thermal/next] " thermal-bot for Daniel Lezcano
2022-10-03 9:25 ` [PATCH v8 24/29] thermal/drivers/da9062: " Daniel Lezcano
2022-12-09 15:26 ` [thermal: thermal/next] " thermal-bot for Daniel Lezcano
2022-10-03 9:25 ` [PATCH v8 25/29] thermal/drivers/ti: Remove unused macros ti_thermal_get_trip_value() / ti_thermal_trip_is_valid() Daniel Lezcano
2022-12-09 15:26 ` [thermal: thermal/next] " thermal-bot for Daniel Lezcano
2022-10-03 9:25 ` [PATCH v8 26/29] thermal/drivers/acerhdf: Use generic thermal_zone_get_trip() function Daniel Lezcano
2022-12-09 15:26 ` [thermal: thermal/next] " thermal-bot for Daniel Lezcano
2022-10-03 9:26 ` [PATCH v8 27/29] thermal/drivers/cxgb4: " Daniel Lezcano
2022-12-09 15:26 ` [thermal: thermal/next] " thermal-bot for Daniel Lezcano
2022-10-03 9:26 ` [PATCH v8 28/29] thermal/intel/int340x: Replace parameter to simplify Daniel Lezcano
2022-12-09 15:26 ` [thermal: thermal/next] " thermal-bot for Daniel Lezcano
2022-10-03 9:26 ` [PATCH v8 29/29] thermal/drivers/intel: Use generic thermal_zone_get_trip() function Daniel Lezcano
2022-12-09 15:26 ` [thermal: thermal/next] " thermal-bot for Daniel Lezcano
2022-10-03 14:10 ` [PATCH v8 00/29] Rework the trip points creation Marek Szyprowski
2022-10-03 15:36 ` Daniel Lezcano
2022-10-03 21:18 ` Daniel Lezcano
2022-10-05 12:37 ` Daniel Lezcano
2022-10-05 13:05 ` Marek Szyprowski
2022-10-06 6:55 ` Daniel Lezcano
2022-10-06 16:25 ` Marek Szyprowski
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=167059959441.4906.13766676550501587988.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=amitk@kernel.org \
--cc=daniel.lezcano@linaro.org \
--cc=linux-pm@vger.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).