Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-16 21:35:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

thermal: core: Pass trip descriptor to thermal_trip_crossed()

Browse Source 
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
This commit is contained in:
Rafael J. Wysocki 2024-10-16 13:27:56 +02:00
parent e254ec292f
commit db0a46b600
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/thermal/thermal_core.c
View File

@ -526,10 +526,12 @@ static void thermal_governor_trip_crossed(struct thermal_governor *governor,
} }
static void thermal_trip_crossed(struct thermal_zone_device *tz, static void thermal_trip_crossed(struct thermal_zone_device *tz,
const struct thermal_trip *trip, struct thermal_trip_desc *td,
struct thermal_governor *governor, struct thermal_governor *governor,
bool crossed_up) bool crossed_up)
{ {
const struct thermal_trip *trip = &td->trip;
if (crossed_up) { if (crossed_up) {
thermal_notify_tz_trip_up(tz, trip); thermal_notify_tz_trip_up(tz, trip);
thermal_debug_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) { 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_del_init(&td->list_node);
} }
list_for_each_entry_safe_reverse(td, next, &way_down_list, 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); 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); EXPORT_SYMBOL_GPL(thermal_zone_device_update);
void thermal_zone_trip_down(struct thermal_zone_device *tz, 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 *), int for_each_thermal_governor(int (*cb)(struct thermal_governor *, void *),

2
drivers/thermal/thermal_core.h
View File

@ -274,7 +274,7 @@ int thermal_zone_trip_id(const struct thermal_zone_device *tz,
const struct thermal_trip *trip); const struct thermal_trip *trip);
int __thermal_zone_get_temp(struct thermal_zone_device *tz, int *temp); int __thermal_zone_get_temp(struct thermal_zone_device *tz, int *temp);
void thermal_zone_trip_down(struct thermal_zone_device *tz, 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, void thermal_zone_set_trip_hyst(struct thermal_zone_device *tz,
struct thermal_trip *trip, int hyst); struct thermal_trip *trip, int hyst);

2
drivers/thermal/thermal_trip.c
View File

@ -118,7 +118,7 @@ void thermal_zone_set_trip_temp(struct thermal_zone_device *tz,
tz->passive--; tz->passive--;
WARN_ON_ONCE(tz->passive < 0); 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 * Invalidate the threshold to avoid triggering a spurious