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,
"Niklas Söderlund" <niklas.soderlund+renesas@ragnatech.se>,
"Niklas Söderlund" <niklas.soderlund@ragnatech.se>,
"Amit Kucheria" <amitk@kernel.org>,
"Zhang Rui" <rui.zhang@intel.com>,
linux-renesas-soc@vger.kernel.org (open list:RENESAS R-CAR
THERMAL DRIVERS)
Subject: [PATCH v3 23/30] thermal/drivers/rcar: Use generic thermal_zone_get_trip() function
Date: Tue, 6 Sep 2022 18:47:13 +0200 [thread overview]
Message-ID: <20220906164720.330701-24-daniel.lezcano@linaro.org> (raw)
In-Reply-To: <20220906164720.330701-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: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>
---
drivers/thermal/rcar_thermal.c | 49 +++++-----------------------------
1 file changed, 6 insertions(+), 43 deletions(-)
diff --git a/drivers/thermal/rcar_thermal.c b/drivers/thermal/rcar_thermal.c
index 4df42d70d867..003457810072 100644
--- a/drivers/thermal/rcar_thermal.c
+++ b/drivers/thermal/rcar_thermal.c
@@ -278,52 +278,16 @@ static int rcar_thermal_get_temp(struct thermal_zone_device *zone, int *temp)
return rcar_thermal_get_current_temp(priv, temp);
}
-static int rcar_thermal_get_trip_type(struct thermal_zone_device *zone,
- int trip, enum thermal_trip_type *type)
-{
- struct rcar_thermal_priv *priv = rcar_zone_to_priv(zone);
- struct device *dev = rcar_priv_to_dev(priv);
-
- /* see rcar_thermal_get_temp() */
- switch (trip) {
- case 0: /* +90 <= temp */
- *type = THERMAL_TRIP_CRITICAL;
- break;
- default:
- dev_err(dev, "rcar driver trip error\n");
- return -EINVAL;
- }
-
- return 0;
-}
-
-static int rcar_thermal_get_trip_temp(struct thermal_zone_device *zone,
- int trip, int *temp)
-{
- struct rcar_thermal_priv *priv = rcar_zone_to_priv(zone);
- struct device *dev = rcar_priv_to_dev(priv);
-
- /* see rcar_thermal_get_temp() */
- switch (trip) {
- case 0: /* +90 <= temp */
- *temp = MCELSIUS(90);
- break;
- default:
- dev_err(dev, "rcar driver trip error\n");
- return -EINVAL;
- }
-
- return 0;
-}
-
static struct thermal_zone_device_ops rcar_thermal_zone_of_ops = {
.get_temp = rcar_thermal_get_temp,
};
static struct thermal_zone_device_ops rcar_thermal_zone_ops = {
.get_temp = rcar_thermal_get_temp,
- .get_trip_type = rcar_thermal_get_trip_type,
- .get_trip_temp = rcar_thermal_get_trip_temp,
+};
+
+static struct thermal_trip trips[] = {
+ { .type = THERMAL_TRIP_CRITICAL, .temperature = 90000 }
};
/*
@@ -531,9 +495,8 @@ static int rcar_thermal_probe(struct platform_device *pdev)
dev, i, priv,
&rcar_thermal_zone_of_ops);
} else {
- priv->zone = thermal_zone_device_register(
- "rcar_thermal",
- 1, 0, priv,
+ priv->zone = thermal_zone_device_register_with_trips(
+ "rcar_thermal", trips, ARRAY_SIZE(trips), 0, priv,
&rcar_thermal_zone_ops, NULL, 0,
idle);
--
2.34.1
next prev parent reply other threads:[~2022-09-06 17:03 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-06 16:46 [PATCH v3 00/30] Rework the trip points creation Daniel Lezcano
2022-09-06 16:46 ` [PATCH v3 01/30] thermal/core: Add a generic thermal_zone_get_trip() function Daniel Lezcano
2022-09-06 16:46 ` [PATCH v3 02/30] thermal/sysfs: Do not make get_trip_hyst optional Daniel Lezcano
2022-09-06 16:46 ` [PATCH v3 03/30] thermal/core: Add a generic thermal_zone_set_trip() function Daniel Lezcano
2022-09-06 16:46 ` [PATCH v3 04/30] thermal/core: Add a generic thermal_zone_get_crit_temp() function Daniel Lezcano
2022-09-06 16:46 ` [PATCH v3 05/30] thermal/core/governors: Use thermal_zone_get_trip() instead of ops functions Daniel Lezcano
2022-09-06 16:46 ` [PATCH v3 06/30] thermal/of: Use generic thermal_zone_get_trip() function Daniel Lezcano
2022-09-06 16:46 ` [PATCH v3 07/30] thermal/of: Remove unused functions Daniel Lezcano
2022-09-06 16:46 ` [PATCH v3 08/30] thermal/drivers/exynos: Use generic thermal_zone_get_trip() function Daniel Lezcano
2022-09-07 11:06 ` Krzysztof Kozlowski
2022-09-06 16:46 ` [PATCH v3 09/30] thermal/drivers/exynos: of_thermal_get_ntrips() Daniel Lezcano
2022-09-06 16:47 ` [PATCH v3 10/30] thermal/drivers/exynos: Replace of_thermal_is_trip_valid() by thermal_zone_get_trip() Daniel Lezcano
2022-09-07 11:07 ` Krzysztof Kozlowski
2022-09-06 16:47 ` [PATCH v3 11/30] thermal/drivers/tegra: Use generic thermal_zone_get_trip() function Daniel Lezcano
2022-09-16 16:56 ` Daniel Lezcano
2022-09-06 16:47 ` [PATCH v3 12/30] thermal/drivers/uniphier: " Daniel Lezcano
2022-09-06 16:47 ` [PATCH v3 13/30] thermal/drivers/hisi: " Daniel Lezcano
2022-09-06 16:47 ` [PATCH v3 14/30] thermal/drivers/qcom: " Daniel Lezcano
2022-09-06 16:47 ` [PATCH v3 15/30] thermal/drivers/armada: " Daniel Lezcano
2022-09-16 17:00 ` Daniel Lezcano
2022-09-06 16:47 ` [PATCH v3 16/30] thermal/drivers/rcar_gen3: Use the generic function to get the number of trips Daniel Lezcano
2022-09-06 16:47 ` [PATCH v3 17/30] thermal/of: Remove of_thermal_get_ntrips() Daniel Lezcano
2022-09-06 16:47 ` [PATCH v3 18/30] thermal/of: Remove of_thermal_is_trip_valid() Daniel Lezcano
2022-09-06 16:47 ` [PATCH v3 19/30] thermal/of: Remove of_thermal_set_trip_hyst() Daniel Lezcano
2022-09-06 16:47 ` [PATCH v3 20/30] thermal/of: Remove of_thermal_get_crit_temp() Daniel Lezcano
2022-09-06 16:47 ` [PATCH v3 21/30] thermal/drivers/st: Use generic trip points Daniel Lezcano
2022-09-06 16:47 ` [PATCH v3 22/30] thermal/drivers/imx: Use generic thermal_zone_get_trip() function Daniel Lezcano
2022-09-16 17:02 ` Daniel Lezcano
2022-09-06 16:47 ` Daniel Lezcano [this message]
2022-09-06 16:47 ` [PATCH v3 24/30] thermal/drivers/broadcom: " Daniel Lezcano
2022-09-06 16:47 ` [PATCH v3 25/30] thermal/drivers/da9062: " Daniel Lezcano
2022-09-06 16:47 ` [PATCH v3 26/30] thermal/drivers/ti: Remove unused macros ti_thermal_get_trip_value() / ti_thermal_trip_is_valid() Daniel Lezcano
2022-09-06 16:47 ` [PATCH v3 27/30] thermal/drivers/acerhdf: Use generic thermal_zone_get_trip() function Daniel Lezcano
2022-09-06 16:47 ` [PATCH v3 28/30] thermal/drivers/cxgb4: " Daniel Lezcano
2022-09-06 16:47 ` [PATCH v3 29/30] thermal/intel/int340x: Replace parameter to simplify Daniel Lezcano
2022-09-24 17:36 ` Rafael J. Wysocki
2022-09-24 17:44 ` Daniel Lezcano
2022-09-06 16:47 ` [PATCH v3 30/30] thermal/drivers/intel: Use generic thermal_zone_get_trip() function Daniel Lezcano
2022-09-16 17:06 ` Daniel Lezcano
2022-09-19 6:54 ` srinivas pandruvada
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=20220906164720.330701-24-daniel.lezcano@linaro.org \
--to=daniel.lezcano@linaro.org \
--cc=amitk@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=niklas.soderlund+renesas@ragnatech.se \
--cc=niklas.soderlund@ragnatech.se \
--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).