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

Commit da9373d6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal 

Pull thermal fixes from Eduardo Valentin:
 "A couple of minor fixes for the thermal subsystem.

  Specifics in this pull request:

   - Fixes in hisilicon thermal driver
   - More fixes of unsigned to int type change in thermal_core.c"

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal:
  thermal: use %d to print S32 parameters
  thermal: hisilicon: increase temperature resolution
parents 1b46bac6 15333e3a

drivers/thermal/hisi_thermal.c

+2 −2
Original line number Diff line number Diff line
@@ -68,12 +68,12 @@ static inline int _step_to_temp(int step) 
	 * Every step equals (1 * 200) / 255 celsius, and finally

	 * need convert to millicelsius.

	 */

	return (HISI_TEMP_BASE + (step * 200 / 255)) * 1000;

	return (HISI_TEMP_BASE * 1000 + (step * 200000 / 255));

}



static inline long _temp_to_step(long temp)

{

	return ((temp / 1000 - HISI_TEMP_BASE) * 255 / 200);

	return ((temp - HISI_TEMP_BASE * 1000) * 255) / 200000;

}



static long hisi_thermal_get_sensor_temp(struct hisi_thermal_data *data,

drivers/thermal/thermal_core.c

+1 −1
Original line number Diff line number Diff line
@@ -959,7 +959,7 @@ static DEVICE_ATTR(sustainable_power, S_IWUSR | S_IRUGO, sustainable_power_show, 
	struct thermal_zone_device *tz = to_thermal_zone(dev);		\

									\

	if (tz->tzp)							\

		return sprintf(buf, "%u\n", tz->tzp->name);		\

		return sprintf(buf, "%d\n", tz->tzp->name);		\

	else								\

		return -EIO;						\

	}								\