Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-22 12:11:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

thermal: core: Introduce thermal_instance_add()

Browse Source 
To reduce the number of redundant result checks in
thermal_bind_cdev_to_trip() and make the code in it easier to
follow, move some of it to a new function called thermal_instance_add()
and make thermal_bind_cdev_to_trip() invoke that function.

No intentional functional impact.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Link: https://patch.msgid.link/3618899.iIbC2pHGDl@rjwysocki.net
Reviewed-by: Lukasz Luba <lukasz.luba@arm.com>
This commit is contained in:
Rafael J. Wysocki 2024-10-11 00:13:50 +02:00
parent 33eab804d6
commit 6d153f52cc
1 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
drivers/thermal/thermal_core.c
View File

@ -745,6 +745,28 @@ struct thermal_zone_device *thermal_zone_get_by_id(int id)
* binding, and unbinding.
*/
static int thermal_instance_add(struct thermal_instance *new_instance,
struct thermal_cooling_device *cdev,
struct thermal_trip_desc *td)
{
struct thermal_instance *instance;
list_for_each_entry(instance, &td->thermal_instances, trip_node) {
if (instance->cdev == cdev)
return -EEXIST;
}
list_add_tail(&new_instance->trip_node, &td->thermal_instances);
mutex_lock(&cdev->lock);
list_add_tail(&new_instance->cdev_node, &cdev->thermal_instances);
mutex_unlock(&cdev->lock);
return 0;
}
/**
* thermal_bind_cdev_to_trip - bind a cooling device to a thermal zone
* @tz: pointer to struct thermal_zone_device
@ -763,7 +785,7 @@ static int thermal_bind_cdev_to_trip(struct thermal_zone_device *tz,
struct thermal_cooling_device *cdev,
struct cooling_spec *cool_spec)
{
struct thermal_instance *dev, *instance;
struct thermal_instance *dev;
bool upper_no_limit;
int result;
@ -825,23 +847,15 @@ static int thermal_bind_cdev_to_trip(struct thermal_zone_device *tz,
if (result)
goto remove_trip_file;
mutex_lock(&cdev->lock);
list_for_each_entry(instance, &td->thermal_instances, trip_node)
if (instance->cdev == cdev) {
result = -EEXIST;
break;
}
if (!result) {
list_add_tail(&dev->trip_node, &td->thermal_instances);
list_add_tail(&dev->cdev_node, &cdev->thermal_instances);
}
mutex_unlock(&cdev->lock);
result = thermal_instance_add(dev, cdev, td);
if (result)
goto remove_weight_file;
if (!result) {
thermal_governor_update_tz(tz, THERMAL_TZ_BIND_CDEV);
return 0;
}
thermal_governor_update_tz(tz, THERMAL_TZ_BIND_CDEV);
return 0;
remove_weight_file:
device_remove_file(&tz->device, &dev->weight_attr);
remove_trip_file:
device_remove_file(&tz->device, &dev->attr);