Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57120fac authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 8714f8f5 5a5e78cd

drivers/thermal/cpu_cooling.c

+8 −8
Original line number Diff line number Diff line
@@ -857,14 +857,6 @@ __cpufreq_cooling_register(struct device_node *np, 
		goto free_power_table;

	}



	snprintf(dev_name, sizeof(dev_name), "thermal-cpufreq-%d",

		 cpufreq_dev->id);



	cool_dev = thermal_of_cooling_device_register(np, dev_name, cpufreq_dev,

						      &cpufreq_cooling_ops);

	if (IS_ERR(cool_dev))

		goto remove_idr;



	/* Fill freq-table in descending order of frequencies */

	for (i = 0, freq = -1; i <= cpufreq_dev->max_level; i++) {

		freq = find_next_max(table, freq);
@@ -877,6 +869,14 @@ __cpufreq_cooling_register(struct device_node *np, 
			pr_debug("%s: freq:%u KHz\n", __func__, freq);

	}



	snprintf(dev_name, sizeof(dev_name), "thermal-cpufreq-%d",

		 cpufreq_dev->id);



	cool_dev = thermal_of_cooling_device_register(np, dev_name, cpufreq_dev,

						      &cpufreq_cooling_ops);

	if (IS_ERR(cool_dev))

		goto remove_idr;



	cpufreq_dev->clipped_freq = cpufreq_dev->freq_table[0];

	cpufreq_dev->cool_dev = cool_dev;

include/linux/thermal.h

+2 −0
Original line number Diff line number Diff line
@@ -335,6 +335,8 @@ struct thermal_genl_event { 
 * @get_trend: a pointer to a function that reads the sensor temperature trend.

 * @set_emul_temp: a pointer to a function that sets sensor emulated

 *		   temperature.

 * @set_trip_temp: a pointer to a function that sets the trip temperature on

 *		   hardware.

 */

struct thermal_zone_of_device_ops {

	int (*get_temp)(void *, int *);