thermal: core: Pass trip descriptor to thermal_trip_crossed()

In preparation for subsequent changes, modify thermal_trip_crossed()
to take a trip descriptor pointer instead of a pointer to struct
thermal_trip and propagate this change to thermal_zone_trip_down().

No functional impact.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Lukasz Luba <lukasz.luba@arm.com>
Link: https://patch.msgid.link/10547668.nUPlyArG6x@rjwysocki.net

diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
index f83c5c67cbe50fcba852b25f51b5e050e1a740dd..c8144a6bb001176f1f4c79557a0722a7e045e036 100644 (file)
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@ -526,10 +526,12 @@ static void thermal_governor_trip_crossed(struct thermal_governor *governor,
 }
 
 static void thermal_trip_crossed(struct thermal_zone_device *tz,
-                                const struct thermal_trip *trip,
+                                struct thermal_trip_desc *td,
                                 struct thermal_governor *governor,
                                 bool crossed_up)
 {
+       const struct thermal_trip *trip = &td->trip;
+
        if (crossed_up) {
                thermal_notify_tz_trip_up(tz, trip);
                thermal_debug_tz_trip_up(tz, trip);
@@ -589,12 +591,12 @@ void __thermal_zone_device_update(struct thermal_zone_device *tz,
        }
 
        list_for_each_entry_safe(td, next, &way_up_list, list_node) {
-               thermal_trip_crossed(tz, &td->trip, governor, true);
+               thermal_trip_crossed(tz, td, governor, true);
                list_del_init(&td->list_node);
        }
 
        list_for_each_entry_safe_reverse(td, next, &way_down_list, list_node) {
-               thermal_trip_crossed(tz, &td->trip, governor, false);
+               thermal_trip_crossed(tz, td, governor, false);
                list_del_init(&td->list_node);
        }
 
@@ -664,9 +666,9 @@ void thermal_zone_device_update(struct thermal_zone_device *tz,
 EXPORT_SYMBOL_GPL(thermal_zone_device_update);
 
 void thermal_zone_trip_down(struct thermal_zone_device *tz,
-                           const struct thermal_trip *trip)
+                           struct thermal_trip_desc *td)
 {
-       thermal_trip_crossed(tz, trip, thermal_get_tz_governor(tz), false);
+       thermal_trip_crossed(tz, td, thermal_get_tz_governor(tz), false);
 }
 
 int for_each_thermal_governor(int (*cb)(struct thermal_governor *, void *),

diff --git a/drivers/thermal/thermal_core.h b/drivers/thermal/thermal_core.h
index 553ce4d131924f4ad364b23c446d0f6b63cae1bc..e1463ee1f7dcdb144023df31a593d6505aba6010 100644 (file)
--- a/drivers/thermal/thermal_core.h
+++ b/drivers/thermal/thermal_core.h
@@ -274,7 +274,7 @@ 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,
-                           const struct thermal_trip *trip);
+                           struct thermal_trip_desc *td);
 void thermal_zone_set_trip_hyst(struct thermal_zone_device *tz,
                                struct thermal_trip *trip, int hyst);
 

diff --git a/drivers/thermal/thermal_trip.c b/drivers/thermal/thermal_trip.c
index 09474453baa58db5d681506977bf1b0e9f8580ae..37db75fb959fee25c3177a62e89845ec85017e03 100644 (file)
--- a/drivers/thermal/thermal_trip.c
+++ b/drivers/thermal/thermal_trip.c
@@ -118,7 +118,7 @@ void thermal_zone_set_trip_temp(struct thermal_zone_device *tz,
                                tz->passive--;
                                WARN_ON_ONCE(tz->passive < 0);
                        }
-                       thermal_zone_trip_down(tz, trip);
+                       thermal_zone_trip_down(tz, td);
                }
                /*
                 * Invalidate the threshold to avoid triggering a spurious