tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge back earlier thermal core updates for 7.1

Rafael J. Wysocki 49c7db1f 9e07e3b8

+6 -6
+2 -1
drivers/thermal/devfreq_cooling.c
··· 472 472 remove_qos_req: 473 473 dev_pm_qos_remove_request(&dfc->req_max_freq); 474 474 free_table: 475 - kfree(dfc->freq_table); 475 + if (!dfc->em_pd) 476 + kfree(dfc->freq_table); 476 477 free_dfc: 477 478 kfree(dfc); 478 479
+1 -1
drivers/thermal/thermal_core.c
··· 863 863 goto free_mem; 864 864 865 865 dev->id = result; 866 - sprintf(dev->name, "cdev%d", dev->id); 866 + snprintf(dev->name, sizeof(dev->name), "cdev%d", dev->id); 867 867 result = 868 868 sysfs_create_link(&tz->device.kobj, &cdev->device.kobj, dev->name); 869 869 if (result)
+3 -4
drivers/thermal/thermal_sysfs.c
··· 18 18 #include <linux/err.h> 19 19 #include <linux/slab.h> 20 20 #include <linux/string.h> 21 + #include <linux/string_choices.h> 21 22 #include <linux/jiffies.h> 22 23 23 24 #include "thermal_core.h" ··· 57 56 58 57 guard(thermal_zone)(tz); 59 58 60 - if (tz->mode == THERMAL_DEVICE_ENABLED) 61 - return sysfs_emit(buf, "enabled\n"); 62 - 63 - return sysfs_emit(buf, "disabled\n"); 59 + return sysfs_emit(buf, "%s\n", 60 + str_enabled_disabled(tz->mode == THERMAL_DEVICE_ENABLED)); 64 61 } 65 62 66 63 static ssize_t