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

torvalds · torvalds · commit da9373d67c8a · 2016-04-30T18:57:42.000-07:00
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
diff --git a/drivers/thermal/hisi_thermal.c b/drivers/thermal/hisi_thermal.c
@@ -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,
diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
@@ -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;						\
 	}								\

Original file line number	Diff line number	Diff line change
`@@ -68,12 +68,12 @@ static inline int _step_to_temp(int step)`
`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,`
Original file line number	Diff line number	Diff line change
`@@ -959,7 +959,7 @@ static DEVICE_ATTR(sustainable_power, S_IWUSR \| S_IRUGO, sustainable_power_show,`
`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`	`} \`