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 tag 'thermal-5.18-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull thermal control fixes from Rafael Wysocki:
"These take back recent chages that started to confuse users and fix up
an attr.show callback prototype in a driver.

Specifics:

- Stop warning about deprecation of the userspace thermal governor
and cooling device status interface, because there are cases in
which user space has to drive thermal management with the help of
them (Daniel Lezcano)

- Fix attr.show callback prototype in the int340x thermal driver
(Kees Cook)"

* tag 'thermal-5.18-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
thermal/governor: Remove deprecated information
Revert "thermal/core: Deprecate changing cooling device state from userspace"
thermal: int340x: Fix attr.show callback prototype

Linus Torvalds 3c76fe74 659ed6e2

+7 -9
+4 -2
drivers/thermal/Kconfig
··· 113 113 bool "user_space" 114 114 select THERMAL_GOV_USER_SPACE 115 115 help 116 - Select this if you want to let the user space manage the 117 - platform thermals. 116 + The Userspace governor allows to get trip point crossed 117 + notification from the kernel via uevents. It is recommended 118 + to use the netlink interface instead which gives richer 119 + information about the thermal framework events. 118 120 119 121 config THERMAL_DEFAULT_GOV_POWER_ALLOCATOR 120 122 bool "power_allocator"
+1 -2
drivers/thermal/gov_user_space.c
··· 17 17 18 18 static int user_space_bind(struct thermal_zone_device *tz) 19 19 { 20 - pr_warn_once("Userspace governor deprecated: use thermal netlink " \ 21 - "notification instead\n"); 20 + pr_info_once("Consider using thermal netlink events interface\n"); 22 21 23 22 return 0; 24 23 }
+2 -2
drivers/thermal/intel/int340x_thermal/int3400_thermal.c
··· 68 68 struct odvp_attr { 69 69 int odvp; 70 70 struct int3400_thermal_priv *priv; 71 - struct kobj_attribute attr; 71 + struct device_attribute attr; 72 72 }; 73 73 74 74 static ssize_t data_vault_read(struct file *file, struct kobject *kobj, ··· 311 311 return result; 312 312 } 313 313 314 - static ssize_t odvp_show(struct kobject *kobj, struct kobj_attribute *attr, 314 + static ssize_t odvp_show(struct device *dev, struct device_attribute *attr, 315 315 char *buf) 316 316 { 317 317 struct odvp_attr *odvp_attr;
-3
drivers/thermal/thermal_sysfs.c
··· 610 610 unsigned long state; 611 611 int result; 612 612 613 - dev_warn_once(&cdev->device, 614 - "Setting cooling device state is deprecated\n"); 615 - 616 613 if (sscanf(buf, "%ld\n", &state) != 1) 617 614 return -EINVAL; 618 615