Re: [PATCH v1 08/10] thermal: core: Eliminate thermal_zone_trip_down()

From: Lukasz Luba
Date: Thu Oct 24 2024 - 06:33:18 EST




On 10/16/24 12:33, Rafael J. Wysocki wrote:
From: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>

Since thermal_zone_set_trip_temp() is not located in the same file

nit: s/not/now

as thermal_trip_crossed(), it can invoke the latter directly without
using the thermal_zone_trip_down() wrapper that has no other users.

Update thermal_zone_set_trip_temp() accordingly and drop
thermal_zone_trip_down().

No functional impact.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@xxxxxxxxx>
---
drivers/thermal/thermal_core.c | 8 +-------
drivers/thermal/thermal_core.h | 2 --
2 files changed, 1 insertion(+), 9 deletions(-)

Index: linux-pm/drivers/thermal/thermal_core.c
===================================================================
--- linux-pm.orig/drivers/thermal/thermal_core.c
+++ linux-pm/drivers/thermal/thermal_core.c
@@ -565,7 +565,7 @@ void thermal_zone_set_trip_temp(struct t
* are needed to compensate for the lack of it going forward.
*/
if (tz->temperature >= td->threshold)
- thermal_zone_trip_down(tz, td);
+ thermal_trip_crossed(tz, td, thermal_get_tz_governor(tz), false);

minor thing:
won't that be too long line?
IMHO we can add somewhere earlier:
struct thermal_governor *gov = thermal_get_tz_governor(tz);
and use it here

/*
* Invalidate the threshold to avoid triggering a spurious
@@ -699,12 +699,6 @@ void thermal_zone_device_update(struct t
}
EXPORT_SYMBOL_GPL(thermal_zone_device_update);
-void thermal_zone_trip_down(struct thermal_zone_device *tz,
- struct thermal_trip_desc *td)
-{
- thermal_trip_crossed(tz, td, thermal_get_tz_governor(tz), false);
-}
-
int for_each_thermal_governor(int (*cb)(struct thermal_governor *, void *),
void *data)
{
Index: linux-pm/drivers/thermal/thermal_core.h
===================================================================
--- linux-pm.orig/drivers/thermal/thermal_core.h
+++ linux-pm/drivers/thermal/thermal_core.h
@@ -273,8 +273,6 @@ void thermal_zone_set_trips(struct therm
int thermal_zone_trip_id(const struct thermal_zone_device *tz,
const struct thermal_trip *trip);
int __thermal_zone_get_temp(struct thermal_zone_device *tz, int *temp);
-void thermal_zone_trip_down(struct thermal_zone_device *tz,
- struct thermal_trip_desc *td);
void thermal_zone_set_trip_hyst(struct thermal_zone_device *tz,
struct thermal_trip *trip, int hyst);




other than that, LGTM

Reviewed-by: Lukasz Luba <lukasz.luba@xxxxxxx>