Sandro/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-09-18 23:09:29 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "thermal/core: Allocate the thermal class dynamically"

Browse Source 
This reverts commit 34f5400364 ("thermal/core: Allocate the thermal
class dynamically") that went against driver core changes aiming at the
elimination of class_create() [1].

No intentional functional impact.

Link: https://lore.kernel.org/linux-pm/2026082411-flask-rewire-434f@gregkh/
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Link: https://patch.msgid.link/4761117.LvFx2qVVIh@rafael.j.wysocki
This commit is contained in:
Rafael J. Wysocki
2026-08-25 21:08:46 +02:00
parent 1087c29d9c
commit aa4174127f
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/thermal/thermal_core.c
+7 -9
View File
@@ -889,7 +889,9 @@ unbind:
kfree(pos);
}
static struct class *thermal_class __ro_after_init;
static const struct class thermal_class = {
.name = "thermal",
};
static bool thermal_class_unavailable __ro_after_init = true;
static inline
@@ -1011,7 +1013,7 @@ int thermal_cooling_device_add(struct thermal_cooling_device *cdev, void *devdat
mutex_init(&cdev->lock);
INIT_LIST_HEAD(&cdev->thermal_instances);
cdev->updated = false;
cdev->device.class = thermal_class;
cdev->device.class = &thermal_class;
cdev->device.release = thermal_cdev_release;
device_initialize(&cdev->device);
cdev->devdata = devdata;
@@ -1484,7 +1486,7 @@ thermal_zone_device_register_with_trips(const char *type,
if (!tz->ops.critical)
tz->ops.critical = thermal_zone_device_critical;
tz->device.class = thermal_class;
tz->device.class = &thermal_class;
tz->device.release = thermal_zone_device_release;
tz->devdata = devdata;
tz->num_trips = num_trips;
@@ -1790,7 +1792,6 @@ void thermal_pm_complete(void)
static int __init thermal_init(void)
{
struct class *tc;
int result;
thermal_debug_init();
@@ -1809,13 +1810,10 @@ static int __init thermal_init(void)
if (result)
goto unregister_governors;
tc = class_create("thermal");
if (IS_ERR(tc)) {
result = PTR_ERR(tc);
result = class_register(&thermal_class);
if (result)
goto unregister_governors;
}
thermal_class = tc;
thermal_class_unavailable = false;
return 0;