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 v5 12/30] thermal/drivers/uniphier: Use generic thermal_zone_get_trip() function Date: Mon, 26 Sep 2022 16:05:46 +0200 [thread overview] Message-ID: <20220926140604.4173723-13-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> 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 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
WARNING: multiple messages have this Message-ID (diff)
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 v5 12/30] thermal/drivers/uniphier: Use generic thermal_zone_get_trip() function Date: Mon, 26 Sep 2022 16:05:46 +0200 [thread overview] Message-ID: <20220926140604.4173723-13-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> 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-26 14:08 UTC|newest] Thread overview: 49+ 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 ` 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 ` 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 ` 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 ` Daniel Lezcano [this message] 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 ` Daniel Lezcano 2022-09-26 14:05 ` [PATCH v5 23/30] thermal/drivers/rcar: " Daniel Lezcano 2022-09-26 14:05 ` [PATCH v5 24/30] thermal/drivers/broadcom: " Daniel Lezcano 2022-09-26 14:05 ` Daniel Lezcano 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-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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.