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,
Amit Kucheria <amitk@kernel.org>,
Thara Gopinath <thara.gopinath@gmail.com>,
Andy Gross <agross@kernel.org>,
Bjorn Andersson <bjorn.andersson@linaro.org>,
Konrad Dybcio <konrad.dybcio@somainline.org>,
Zhang Rui <rui.zhang@intel.com>,
linux-arm-msm@vger.kernel.org (open list:QUALCOMM TSENS THERMAL
DRIVER)
Subject: [PATCH v3 14/30] thermal/drivers/qcom: Use generic thermal_zone_get_trip() function
Date: Tue, 6 Sep 2022 18:47:04 +0200 [thread overview]
Message-ID: <20220906164720.330701-15-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>
Acked-by: Amit Kucheria <amitk@kernel.org>
---
drivers/thermal/qcom/qcom-spmi-temp-alarm.c | 39 +++++++++------------
1 file changed, 17 insertions(+), 22 deletions(-)
diff --git a/drivers/thermal/qcom/qcom-spmi-temp-alarm.c b/drivers/thermal/qcom/qcom-spmi-temp-alarm.c
index be785ab37e53..127e8c90211c 100644
--- a/drivers/thermal/qcom/qcom-spmi-temp-alarm.c
+++ b/drivers/thermal/qcom/qcom-spmi-temp-alarm.c
@@ -263,17 +263,17 @@ static int qpnp_tm_update_critical_trip_temp(struct qpnp_tm_chip *chip,
return qpnp_tm_write(chip, QPNP_TM_REG_SHUTDOWN_CTRL1, reg);
}
-static int qpnp_tm_set_trip_temp(struct thermal_zone_device *tz, int trip, int temp)
+static int qpnp_tm_set_trip_temp(struct thermal_zone_device *tz, int trip_id, int temp)
{
struct qpnp_tm_chip *chip = tz->devdata;
- const struct thermal_trip *trip_points;
+ struct thermal_trip trip;
int ret;
- trip_points = of_thermal_get_trip_points(chip->tz_dev);
- if (!trip_points)
- return -EINVAL;
+ ret = thermal_zone_get_trip(chip->tz_dev, trip_id, &trip);
+ if (ret)
+ return ret;
- if (trip_points[trip].type != THERMAL_TRIP_CRITICAL)
+ if (trip.type != THERMAL_TRIP_CRITICAL)
return 0;
mutex_lock(&chip->lock);
@@ -299,22 +299,17 @@ static irqreturn_t qpnp_tm_isr(int irq, void *data)
static int qpnp_tm_get_critical_trip_temp(struct qpnp_tm_chip *chip)
{
- int ntrips;
- const struct thermal_trip *trips;
- int i;
-
- ntrips = of_thermal_get_ntrips(chip->tz_dev);
- if (ntrips <= 0)
- return THERMAL_TEMP_INVALID;
-
- trips = of_thermal_get_trip_points(chip->tz_dev);
- if (!trips)
- return THERMAL_TEMP_INVALID;
-
- for (i = 0; i < ntrips; i++) {
- if (of_thermal_is_trip_valid(chip->tz_dev, i) &&
- trips[i].type == THERMAL_TRIP_CRITICAL)
- return trips[i].temperature;
+ struct thermal_trip trip;
+ int i, ret;
+
+ for (i = 0; i < thermal_zone_get_num_trips(chip->tz_dev); i++) {
+
+ ret = thermal_zone_get_trip(chip->tz_dev, i, &trip);
+ if (ret)
+ continue;
+
+ if (trip.type == THERMAL_TRIP_CRITICAL)
+ return trip.temperature;
}
return THERMAL_TEMP_INVALID;
--
2.34.1
next prev parent reply other threads:[~2022-09-06 17:02 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 ` Daniel Lezcano [this message]
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 ` [PATCH v3 23/30] thermal/drivers/rcar: " Daniel Lezcano
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-15-daniel.lezcano@linaro.org \
--to=daniel.lezcano@linaro.org \
--cc=agross@kernel.org \
--cc=amitk@kernel.org \
--cc=bjorn.andersson@linaro.org \
--cc=konrad.dybcio@somainline.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=rafael@kernel.org \
--cc=rui.zhang@intel.com \
--cc=thara.gopinath@gmail.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).