From: Daniel Lezcano <daniel.lezcano@oss.qualcomm.com>
Date: Wed, 29 Apr 2026 16:14:14 +0000 (+0200)
Subject: thermal/core: Use devm_add_action_or_reset() when registering a cooling device
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=31da1d4451c88b63779bc3f855ae15f718c0e539;p=thirdparty%2Fkernel%2Flinux.git

thermal/core: Use devm_add_action_or_reset() when registering a cooling device

Use devm_add_action_or_reset() which does the replaced code. It
results in a simpler and more concise code.

Signed-off-by: Daniel Lezcano <daniel.lezcano@oss.qualcomm.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@kernel.org>
Reviewed-by: Rafael J. Wysocki (Intel) <rafael@kernel.org>
Link: https://patch.msgid.link/20260429161430.3802970-2-daniel.lezcano@oss.qualcomm.com
---

diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
index 7d7ce855ae88b..db01361569d76 100644
--- a/drivers/thermal/thermal_core.c
+++ b/drivers/thermal/thermal_core.c
@@ -1140,10 +1140,11 @@ thermal_of_cooling_device_register(struct device_node *np,
 }
 EXPORT_SYMBOL_GPL(thermal_of_cooling_device_register);
 
-static void thermal_cooling_device_release(struct device *dev, void *res)
+static void thermal_cooling_device_release(void *data)
 {
-	thermal_cooling_device_unregister(
-				*(struct thermal_cooling_device **)res);
+	struct thermal_cooling_device *cdev = data;
+
+	thermal_cooling_device_unregister(cdev);
 }
 
 /**
@@ -1169,23 +1170,18 @@ devm_thermal_of_cooling_device_register(struct device *dev,
 				const char *type, void *devdata,
 				const struct thermal_cooling_device_ops *ops)
 {
-	struct thermal_cooling_device **ptr, *tcd;
-
-	ptr = devres_alloc(thermal_cooling_device_release, sizeof(*ptr),
-			   GFP_KERNEL);
-	if (!ptr)
-		return ERR_PTR(-ENOMEM);
+	struct thermal_cooling_device *cdev;
+	int ret;
 
-	tcd = __thermal_cooling_device_register(np, type, devdata, ops);
-	if (IS_ERR(tcd)) {
-		devres_free(ptr);
-		return tcd;
-	}
+	cdev = __thermal_cooling_device_register(np, type, devdata, ops);
+	if (IS_ERR(cdev))
+		return cdev;
 
-	*ptr = tcd;
-	devres_add(dev, ptr);
+	ret = devm_add_action_or_reset(dev, thermal_cooling_device_release, cdev);
+	if (ret)
+		return ERR_PTR(ret);
 
-	return tcd;
+	return cdev;
 }
 EXPORT_SYMBOL_GPL(devm_thermal_of_cooling_device_register);