linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
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, Amit Kucheria <amitk@kernel.org>
Subject: [PATCH v5 02/30] thermal/sysfs: Do not make get_trip_hyst optional
Date: Mon, 26 Sep 2022 16:05:36 +0200	[thread overview]
Message-ID: <20220926140604.4173723-3-daniel.lezcano@linaro.org> (raw)
In-Reply-To: <20220926140604.4173723-1-daniel.lezcano@linaro.org>

The get_trip_hyst() ops is optional. It results all around the thermal
framework code a check against the ops pointer and different action
adding more complexity and making the code less readable and
understandable.

A zero hysteresis value is perfectly valid, so instead of adding more
circumvolutions in the code, create unconditionnaly the hysteresis and
use the thermal_zone_get_trip() function which returns a zero
hysteresis if the get_trip_hyst() is not defined.

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
 drivers/thermal/thermal_sysfs.c | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/drivers/thermal/thermal_sysfs.c b/drivers/thermal/thermal_sysfs.c
index 75f6b151a58b..18cdd7cd0008 100644
--- a/drivers/thermal/thermal_sysfs.c
+++ b/drivers/thermal/thermal_sysfs.c
@@ -424,23 +424,20 @@ static int create_trip_attrs(struct thermal_zone_device *tz, int mask)
 		return -ENOMEM;
 	}
 
-	if (tz->ops->get_trip_hyst) {
-		tz->trip_hyst_attrs = kcalloc(tz->num_trips,
-					      sizeof(*tz->trip_hyst_attrs),
-					      GFP_KERNEL);
-		if (!tz->trip_hyst_attrs) {
-			kfree(tz->trip_type_attrs);
-			kfree(tz->trip_temp_attrs);
-			return -ENOMEM;
-		}
+	tz->trip_hyst_attrs = kcalloc(tz->num_trips,
+				      sizeof(*tz->trip_hyst_attrs),
+				      GFP_KERNEL);
+	if (!tz->trip_hyst_attrs) {
+		kfree(tz->trip_type_attrs);
+		kfree(tz->trip_temp_attrs);
+		return -ENOMEM;
 	}
 
 	attrs = kcalloc(tz->num_trips * 3 + 1, sizeof(*attrs), GFP_KERNEL);
 	if (!attrs) {
 		kfree(tz->trip_type_attrs);
 		kfree(tz->trip_temp_attrs);
-		if (tz->ops->get_trip_hyst)
-			kfree(tz->trip_hyst_attrs);
+		kfree(tz->trip_hyst_attrs);
 		return -ENOMEM;
 	}
 
@@ -473,9 +470,6 @@ static int create_trip_attrs(struct thermal_zone_device *tz, int mask)
 		}
 		attrs[indx + tz->num_trips] = &tz->trip_temp_attrs[indx].attr.attr;
 
-		/* create Optional trip hyst attribute */
-		if (!tz->ops->get_trip_hyst)
-			continue;
 		snprintf(tz->trip_hyst_attrs[indx].name, THERMAL_NAME_LENGTH,
 			 "trip_point_%d_hyst", indx);
 
@@ -512,8 +506,7 @@ static void destroy_trip_attrs(struct thermal_zone_device *tz)
 
 	kfree(tz->trip_type_attrs);
 	kfree(tz->trip_temp_attrs);
-	if (tz->ops->get_trip_hyst)
-		kfree(tz->trip_hyst_attrs);
+	kfree(tz->trip_hyst_attrs);
 	kfree(tz->trips_attribute_group.attrs);
 }
 
-- 
2.34.1


  parent reply	other threads:[~2022-09-26 15:19 UTC|newest]

Thread overview: 43+ 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 ` Daniel Lezcano [this message]
2022-09-26 19:16   ` [PATCH v5 02/30] thermal/sysfs: Do not make get_trip_hyst optional 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 ` [PATCH v5 09/30] thermal/drivers/exynos: of_thermal_get_ntrips() 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 ` [PATCH v5 11/30] thermal/drivers/tegra: Use generic thermal_zone_get_trip() function Daniel Lezcano
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 ` [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 ` [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-3-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=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).