Commit 54fc61a1 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki

ACPI: thermal: Collapse trip devices update function wrappers

In order to reduce code duplicationeve further, merge
acpi_thermal_update_passive/active_devices() into one function
called acpi_thermal_update_trip_devices() that will be used for
updating both the passive and active trip points.

No intentional functional impact.
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
parent 317508c6
...@@ -233,14 +233,16 @@ static bool update_trip_devices(struct acpi_thermal *tz, ...@@ -233,14 +233,16 @@ static bool update_trip_devices(struct acpi_thermal *tz,
return true; return true;
} }
static void acpi_thermal_update_passive_devices(struct acpi_thermal *tz) static void acpi_thermal_update_trip_devices(struct acpi_thermal *tz, int index)
{ {
struct acpi_thermal_trip *acpi_trip = &tz->trips.passive.trip; struct acpi_thermal_trip *acpi_trip;
acpi_trip = index == ACPI_THERMAL_TRIP_PASSIVE ?
&tz->trips.passive.trip : &tz->trips.active[index].trip;
if (!acpi_thermal_trip_valid(acpi_trip)) if (!acpi_thermal_trip_valid(acpi_trip))
return; return;
if (update_trip_devices(tz, acpi_trip, ACPI_THERMAL_TRIP_PASSIVE, true)) { if (update_trip_devices(tz, acpi_trip, index, true)) {
return; return;
} }
...@@ -283,20 +285,6 @@ static void acpi_thermal_update_active_trip(struct acpi_thermal *tz, int index) ...@@ -283,20 +285,6 @@ static void acpi_thermal_update_active_trip(struct acpi_thermal *tz, int index)
ACPI_THERMAL_TRIPS_EXCEPTION(tz, "state"); ACPI_THERMAL_TRIPS_EXCEPTION(tz, "state");
} }
static void acpi_thermal_update_active_devices(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;
if (update_trip_devices(tz, acpi_trip, index, true))
return;
acpi_trip->temperature = THERMAL_TEMP_INVALID;
ACPI_THERMAL_TRIPS_EXCEPTION(tz, "state");
}
static int acpi_thermal_adjust_trip(struct thermal_trip *trip, void *data) static int acpi_thermal_adjust_trip(struct thermal_trip *trip, void *data)
{ {
struct acpi_thermal_trip *acpi_trip = trip->priv; struct acpi_thermal_trip *acpi_trip = trip->priv;
...@@ -324,9 +312,9 @@ static void acpi_thermal_adjust_thermal_zone(struct thermal_zone_device *thermal ...@@ -324,9 +312,9 @@ static void acpi_thermal_adjust_thermal_zone(struct thermal_zone_device *thermal
for (i = 0; i < ACPI_THERMAL_MAX_ACTIVE; i++) for (i = 0; i < ACPI_THERMAL_MAX_ACTIVE; i++)
acpi_thermal_update_active_trip(tz, i); acpi_thermal_update_active_trip(tz, i);
} else { } else {
acpi_thermal_update_passive_devices(tz); acpi_thermal_update_trip_devices(tz, ACPI_THERMAL_TRIP_PASSIVE);
for (i = 0; i < ACPI_THERMAL_MAX_ACTIVE; i++) for (i = 0; i < ACPI_THERMAL_MAX_ACTIVE; i++)
acpi_thermal_update_active_devices(tz, i); acpi_thermal_update_trip_devices(tz, i);
} }
for_each_thermal_trip(tz->thermal_zone, acpi_thermal_adjust_trip, tz); for_each_thermal_trip(tz->thermal_zone, acpi_thermal_adjust_trip, tz);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment