tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Linus Torvalds da9373d6 1b46bac6

+3 -3
+2 -2
drivers/thermal/hisi_thermal.c
··· 68 68 * Every step equals (1 * 200) / 255 celsius, and finally 69 69 * need convert to millicelsius. 70 70 */ 71 - return (HISI_TEMP_BASE + (step * 200 / 255)) * 1000; 71 + return (HISI_TEMP_BASE * 1000 + (step * 200000 / 255)); 72 72 } 73 73 74 74 static inline long _temp_to_step(long temp) 75 75 { 76 - return ((temp / 1000 - HISI_TEMP_BASE) * 255 / 200); 76 + return ((temp - HISI_TEMP_BASE * 1000) * 255) / 200000; 77 77 } 78 78 79 79 static long hisi_thermal_get_sensor_temp(struct hisi_thermal_data *data,
+1 -1
drivers/thermal/thermal_core.c
··· 959 959 struct thermal_zone_device *tz = to_thermal_zone(dev); \ 960 960 \ 961 961 if (tz->tzp) \ 962 - return sprintf(buf, "%u\n", tz->tzp->name); \ 962 + return sprintf(buf, "%d\n", tz->tzp->name); \ 963 963 else \ 964 964 return -EIO; \ 965 965 } \