[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <2641944.Lt9SDvczpP@rjwysocki.net>
Date: Sat, 14 Sep 2024 12:43:24 +0200
From: "Rafael J. Wysocki" <rjw@...ysocki.net>
To: Linux PM <linux-pm@...r.kernel.org>
Cc: LKML <linux-kernel@...r.kernel.org>,
Daniel Lezcano <daniel.lezcano@...aro.org>,
Lukasz Luba <lukasz.luba@....com>, Zhang Rui <rui.zhang@...el.com>
Subject:
[RFC PATCH for 6.13 v1 14/20] thermal: core: Introduce thermal_instance_add()
From: Rafael J. Wysocki <rafael.j.wysocki@...el.com>
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 that code 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@...el.com>
---
drivers/thermal/thermal_core.c | 46 ++++++++++++++++++++++++++---------------
1 file changed, 30 insertions(+), 16 deletions(-)
Index: linux-pm/drivers/thermal/thermal_core.c
===================================================================
--- linux-pm.orig/drivers/thermal/thermal_core.c
+++ linux-pm/drivers/thermal/thermal_core.c
@@ -736,6 +736,28 @@ struct thermal_zone_device *thermal_zone
* 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
@@ -754,7 +776,7 @@ static int thermal_bind_cdev_to_trip(str
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;
@@ -816,23 +838,15 @@ static int thermal_bind_cdev_to_trip(str
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);
Powered by blists - more mailing lists