MIRRORS/linux-yocto
1
0
Fork 0
mirror of git://git.yoctoproject.org/linux-yocto.git synced 2025-07-05 21:35:46 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

thermal: ACPI: Use the .should_bind() thermal zone callback

Browse Source 
Make the ACPI thermal zone driver use the .should_bind() thermal zone
callback to provide the thermal core with the information on whether or
not to bind the given cooling device to the given trip point in the
given thermal zone.  If it returns 'true', the thermal core will bind
the cooling device to the trip and the corresponding unbinding will be
taken care of automatically by the core on the removal of the involved
thermal zone or cooling device.

This replaces the .bind() and .unbind() thermal zone callbacks which
allows the code to be simplified quite significantly while providing
the same functionality.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Zhang Rui <rui.zhang@intel.com>
Reviewed-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://patch.msgid.link/1812827.VLH7GnMWUR@rjwysocki.net
This commit is contained in:
Rafael J. Wysocki 2024-08-19 18:02:44 +02:00
parent aa35e56a52
commit b1c75b3820
1 changed files with 9 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
drivers/acpi/thermal.c
View File

@ -558,77 +558,31 @@ static void acpi_thermal_zone_device_critical(struct thermal_zone_device *therma
thermal_zone_device_critical(thermal); thermal_zone_device_critical(thermal);
} }
struct acpi_thermal_bind_data { static bool acpi_thermal_should_bind_cdev(struct thermal_zone_device *thermal,
struct thermal_zone_device *thermal; const struct thermal_trip *trip,
struct thermal_cooling_device *cdev; struct thermal_cooling_device *cdev,
bool bind; struct cooling_spec *c)
};
static int bind_unbind_cdev_cb(struct thermal_trip *trip, void *arg)
{ {
struct acpi_thermal_trip *acpi_trip = trip->priv; struct acpi_thermal_trip *acpi_trip = trip->priv;
struct acpi_thermal_bind_data *bd = arg;
struct thermal_zone_device *thermal = bd->thermal;
struct thermal_cooling_device *cdev = bd->cdev;
struct acpi_device *cdev_adev = cdev->devdata; struct acpi_device *cdev_adev = cdev->devdata;
int i; int i;
/* Skip critical and hot trips. */ /* Skip critical and hot trips. */
if (!acpi_trip) if (!acpi_trip)
return 0; return false;
for (i = 0; i < acpi_trip->devices.count; i++) { for (i = 0; i < acpi_trip->devices.count; i++) {
acpi_handle handle = acpi_trip->devices.handles[i]; acpi_handle handle = acpi_trip->devices.handles[i];
struct acpi_device *adev = acpi_fetch_acpi_dev(handle);
if (adev != cdev_adev) if (acpi_fetch_acpi_dev(handle) == cdev_adev)
continue; return true;
if (bd->bind) {
int ret;
ret = thermal_bind_cdev_to_trip(thermal, trip, cdev,
THERMAL_NO_LIMIT,
THERMAL_NO_LIMIT,
THERMAL_WEIGHT_DEFAULT);
if (ret)
return ret;
} else {
thermal_unbind_cdev_from_trip(thermal, trip, cdev);
}
} }
return 0; return false;
}
static int acpi_thermal_bind_unbind_cdev(struct thermal_zone_device *thermal,
struct thermal_cooling_device *cdev,
bool bind)
{
struct acpi_thermal_bind_data bd = {
.thermal = thermal, .cdev = cdev, .bind = bind
};
return thermal_zone_for_each_trip(thermal, bind_unbind_cdev_cb, &bd);
}
static int
acpi_thermal_bind_cooling_device(struct thermal_zone_device *thermal,
struct thermal_cooling_device *cdev)
{
return acpi_thermal_bind_unbind_cdev(thermal, cdev, true);
}
static int
acpi_thermal_unbind_cooling_device(struct thermal_zone_device *thermal,
struct thermal_cooling_device *cdev)
{
return acpi_thermal_bind_unbind_cdev(thermal, cdev, false);
} }
static const struct thermal_zone_device_ops acpi_thermal_zone_ops = { static const struct thermal_zone_device_ops acpi_thermal_zone_ops = {
.bind = acpi_thermal_bind_cooling_device, .should_bind = acpi_thermal_should_bind_cdev,
.unbind = acpi_thermal_unbind_cooling_device,
.get_temp = thermal_get_temp, .get_temp = thermal_get_temp,
.get_trend = thermal_get_trend, .get_trend = thermal_get_trend,
.hot = acpi_thermal_zone_device_hot, .hot = acpi_thermal_zone_device_hot,