diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2022-10-03 21:43:32 +0300 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2022-10-03 21:43:32 +0300 |
commit | 2e70ea7fb9873e642982f166bf9aaa4a6206fbec (patch) | |
tree | 689ab73ec3bb33ef1eca48665cb26db2b5f65a55 /drivers/hwmon/pmbus | |
parent | a7ae50fc34eb985b4ce9c8c8d937394890f7c36c (diff) | |
parent | 53e41b85939547cda40a7b9748c5a1f9b1f1a865 (diff) | |
parent | cff895277c8558221ba180aefe26799dcb4eec86 (diff) | |
download | linux-2e70ea7fb9873e642982f166bf9aaa4a6206fbec.tar.xz |
Merge branches 'thermal-intel' and 'thermal-drivers'
Merge thermal control driver changes for 6.1-rc1:
- Use module_pci_driver() macro in the int340x processor_thermal
driver (Shang XiaoJing).
- Use get_cpu() instead of smp_processor_id() in the intel_powerclamp
thermal driver to prevent it from crashing and remove unused
accounting for IRQ wakes from it (Srinivas Pandruvada).
- Consolidate priv->data_vault checks in int340x_thermal (Rafael
Wysocki).
- Check the policy first in cpufreq_cooling_register() (Xuewen Yan).
- Drop redundant error message from da9062-thermal (zhaoxiao).
- Drop of_match_ptr() from thermal_mmio (Jean Delvare).
* thermal-intel:
thermal: int340x: processor_thermal: Use module_pci_driver() macro
thermal: intel_powerclamp: Remove accounting for IRQ wakes
thermal: intel_powerclamp: Use get_cpu() instead of smp_processor_id() to avoid crash
thermal: int340x_thermal: Consolidate priv->data_vault checks
* thermal-drivers:
thermal: cpufreq_cooling: Check the policy first in cpufreq_cooling_register()
thermal: da9062-thermal: Drop redundant error message
thermal/drivers/thermal_mmio: Drop of_match_ptr()