| Message ID | 10547668.nUPlyArG6x@rjwysocki.net (mailing list archive) |
|---|---|
| State | In Next |
| Delegated to: | Rafael Wysocki |
| Headers | show |
| Series | thermal: core: Use lists of trips for trip crossing detection and handling | expand |
On 10/16/24 12:27, Rafael J. Wysocki wrote: > From: Rafael J. Wysocki <rafael.j.wysocki@intel.com> > > 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> > --- > drivers/thermal/thermal_core.c | 12 +++++++----- > drivers/thermal/thermal_core.h | 2 +- > drivers/thermal/thermal_trip.c | 2 +- > 3 files changed, 9 insertions(+), 7 deletions(-) > > Index: linux-pm/drivers/thermal/thermal_core.c > =================================================================== > --- linux-pm.orig/drivers/thermal/thermal_core.c > +++ linux-pm/drivers/thermal/thermal_core.c > @@ -526,10 +526,12 @@ static void thermal_governor_trip_crosse > } > > 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 > } > > 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 t > 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 *), > Index: linux-pm/drivers/thermal/thermal_core.h > =================================================================== > --- linux-pm.orig/drivers/thermal/thermal_core.h > +++ linux-pm/drivers/thermal/thermal_core.h > @@ -274,7 +274,7 @@ int thermal_zone_trip_id(const struct th > 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); > > Index: linux-pm/drivers/thermal/thermal_trip.c > =================================================================== > --- linux-pm.orig/drivers/thermal/thermal_trip.c > +++ linux-pm/drivers/thermal/thermal_trip.c > @@ -118,7 +118,7 @@ void thermal_zone_set_trip_temp(struct t > 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 > > > Reviewed-by: Lukasz Luba <lukasz.luba@arm.com>
Index: linux-pm/drivers/thermal/thermal_core.c =================================================================== --- linux-pm.orig/drivers/thermal/thermal_core.c +++ linux-pm/drivers/thermal/thermal_core.c @@ -526,10 +526,12 @@ static void thermal_governor_trip_crosse } 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 } 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 t 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 *), Index: linux-pm/drivers/thermal/thermal_core.h =================================================================== --- linux-pm.orig/drivers/thermal/thermal_core.h +++ linux-pm/drivers/thermal/thermal_core.h @@ -274,7 +274,7 @@ int thermal_zone_trip_id(const struct th 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); Index: linux-pm/drivers/thermal/thermal_trip.c =================================================================== --- linux-pm.orig/drivers/thermal/thermal_trip.c +++ linux-pm/drivers/thermal/thermal_trip.c @@ -118,7 +118,7 @@ void thermal_zone_set_trip_temp(struct t 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