diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2026-08-07 06:48:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2026-08-07 06:48:51 -0700 |
| commit | 7cbe91a4be8536a3f17fb00828fc3f024f0a1e61 (patch) | |
| tree | 4af70fab7f10859e3391cb49f4450108aa4d6aa8 /include | |
| parent | 7e73882ecff98cacbd1a5e1bffa2661a19cf85a1 (diff) | |
| parent | ff8da20b6f47c48d46e47f93f7a59e2d56ee9107 (diff) | |
Merge tag 'thermal-7.2-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull thermal control fixes from Rafael Wysocki:
"Revert three thermal core updates, two recent ones and one older.
The recent ones attempted to fix a design issue in the thermal core
and simplify code on top of that, but they made changes visible to
user space and made it unhappy.
The older one is a misguided code cleanup that introduced a
(potentially nasty) bug"
* tag 'thermal-7.2-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
Revert "thermal/drivers/hwmon: Cleanup coding style a bit"
Revert "thermal: hwmon: Register a hwmon device for each thermal zone"
Revert "thermal: hwmon: Use extra_groups for adding temperature attributes"
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/hwmon.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/hwmon.h b/include/linux/hwmon.h index 77a6f2bffcba..dd713e193d0c 100644 --- a/include/linux/hwmon.h +++ b/include/linux/hwmon.h @@ -480,8 +480,7 @@ hwmon_device_register_with_info(struct device *dev, const struct attribute_group **extra_groups); struct device * hwmon_device_register_for_thermal(struct device *dev, const char *name, - void *drvdata, - const struct attribute_group **extra_groups); + void *drvdata); struct device * devm_hwmon_device_register_with_info(struct device *dev, const char *name, void *drvdata, |