Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
Pull thermal management fixes from Zhang Rui:
- fix an ordering issue in cpu cooling that cooling device is
registered before it's ready (freq_table being populated).
(Lukasz Luba)
- fix a missing comment update (Caesar Wang)
* 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
thermal: add the note for set_trip_temp
thermal: cpu_cooling: fix improper order during initialization
+10
-8
+8
-8
drivers/thermal/cpu_cooling.c
+8
-8
drivers/thermal/cpu_cooling.c
···
857
857
goto free_power_table;
858
858
}
859
859
860
-
snprintf(dev_name, sizeof(dev_name), "thermal-cpufreq-%d",
861
-
cpufreq_dev->id);
862
-
863
-
cool_dev = thermal_of_cooling_device_register(np, dev_name, cpufreq_dev,
864
-
&cpufreq_cooling_ops);
865
-
if (IS_ERR(cool_dev))
866
-
goto remove_idr;
867
-
868
860
/* Fill freq-table in descending order of frequencies */
869
861
for (i = 0, freq = -1; i <= cpufreq_dev->max_level; i++) {
870
862
freq = find_next_max(table, freq);
···
868
876
else
869
877
pr_debug("%s: freq:%u KHz\n", __func__, freq);
870
878
}
879
+
880
+
snprintf(dev_name, sizeof(dev_name), "thermal-cpufreq-%d",
881
+
cpufreq_dev->id);
882
+
883
+
cool_dev = thermal_of_cooling_device_register(np, dev_name, cpufreq_dev,
884
+
&cpufreq_cooling_ops);
885
+
if (IS_ERR(cool_dev))
886
+
goto remove_idr;
871
887
872
888
cpufreq_dev->clipped_freq = cpufreq_dev->freq_table[0];
873
889
cpufreq_dev->cool_dev = cool_dev;
+2
include/linux/thermal.h
+2
include/linux/thermal.h
···
335
335
* @get_trend: a pointer to a function that reads the sensor temperature trend.
336
336
* @set_emul_temp: a pointer to a function that sets sensor emulated
337
337
* temperature.
338
+
* @set_trip_temp: a pointer to a function that sets the trip temperature on
339
+
* hardware.
338
340
*/
339
341
struct thermal_zone_of_device_ops {
340
342
int (*get_temp)(void *, int *);