github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-25 15:41:52 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ACPI: thermal: Combine passive and active trip update functions

Browse Source 
Combine acpi_thermal_update_passive_trip() and
acpi_thermal_update_active_trip() into one common function called
acpi_thermal_update_trip(), so as to reduce code duplication and
prepare the code in question for subsequent changes.

No intentional functional impact.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Daniel Lezcano <daniel.lezcano@linaro.org>
This commit is contained in:
Rafael J. Wysocki 2023-10-03 15:21:30 +02:00
parent 44babd829a
commit 4f9cf91e41
1 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
drivers/acpi/thermal.c
View File

@ -212,14 +212,25 @@ static long get_active_temp(struct acpi_thermal *tz, int index)
return tmp;
}
static void acpi_thermal_update_passive_trip(struct acpi_thermal *tz)
static void acpi_thermal_update_trip(struct acpi_thermal *tz,
int index)
{
struct acpi_thermal_trip *acpi_trip = &tz->trips.passive.trip;
struct acpi_thermal_trip *acpi_trip;
if (!acpi_thermal_trip_valid(acpi_trip) || psv > 0)
acpi_trip = index == ACPI_THERMAL_TRIP_PASSIVE ?
&tz->trips.passive.trip : &tz->trips.active[index].trip;
if (!acpi_thermal_trip_valid(acpi_trip))
return;
acpi_trip->temp_dk = get_passive_temp(tz);
if (index == ACPI_THERMAL_TRIP_PASSIVE) {
if (psv > 0)
return;
acpi_trip->temp_dk = get_passive_temp(tz);
} else {
acpi_trip->temp_dk = get_active_temp(tz, index);
}
if (!acpi_thermal_trip_valid(acpi_trip))
ACPI_THERMAL_TRIPS_EXCEPTION(tz, "state");
}
@ -270,18 +281,6 @@ static void acpi_thermal_update_trip_devices(struct acpi_thermal *tz, int index)
ACPI_THERMAL_TRIPS_EXCEPTION(tz, "state");
}
static void acpi_thermal_update_active_trip(struct acpi_thermal *tz, int index)
{
struct acpi_thermal_trip *acpi_trip = &tz->trips.active[index].trip;
if (!acpi_thermal_trip_valid(acpi_trip))
return;
acpi_trip->temp_dk = get_active_temp(tz, index);
if (!acpi_thermal_trip_valid(acpi_trip))
ACPI_THERMAL_TRIPS_EXCEPTION(tz, "state");
}
static int acpi_thermal_adjust_trip(struct thermal_trip *trip, void *data)
{
struct acpi_thermal_trip *acpi_trip = trip->priv;
@ -305,9 +304,9 @@ static void acpi_thermal_adjust_thermal_zone(struct thermal_zone_device *thermal
int i;
if (data == ACPI_THERMAL_NOTIFY_THRESHOLDS) {
acpi_thermal_update_passive_trip(tz);
acpi_thermal_update_trip(tz, ACPI_THERMAL_TRIP_PASSIVE);
for (i = 0; i < ACPI_THERMAL_MAX_ACTIVE; i++)
acpi_thermal_update_active_trip(tz, i);
acpi_thermal_update_trip(tz, i);
} else {
acpi_thermal_update_trip_devices(tz, ACPI_THERMAL_TRIP_PASSIVE);
for (i = 0; i < ACPI_THERMAL_MAX_ACTIVE; i++)