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

Commit 5e012760 authored by Zhang, Rui's avatar Zhang, Rui Committed by Len Brown
Browse files

ACPI: thermal: show temperature in millidegree Celsius 



as now required by the generic thermal I/F

Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
Acked-by: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 3152fb9f

drivers/acpi/thermal.c

+7 −5
Original line number Diff line number Diff line
@@ -879,6 +879,8 @@ static void acpi_thermal_check(void *data) 
}



/* sys I/F for generic thermal sysfs support */

#define KELVIN_TO_MILLICELSIUS(t) (t * 100 - 273200)



static int thermal_get_temp(struct thermal_zone_device *thermal, char *buf)

{

	struct acpi_thermal *tz = thermal->devdata;
@@ -886,7 +888,7 @@ static int thermal_get_temp(struct thermal_zone_device *thermal, char *buf) 
	if (!tz)

		return -EINVAL;



	return sprintf(buf, "%ld\n", KELVIN_TO_CELSIUS(tz->temperature));

	return sprintf(buf, "%ld\n", KELVIN_TO_MILLICELSIUS(tz->temperature));

}



static const char enabled[] = "kernel";
@@ -980,21 +982,21 @@ static int thermal_get_trip_temp(struct thermal_zone_device *thermal, 


	if (tz->trips.critical.flags.valid) {

		if (!trip)

			return sprintf(buf, "%ld\n", KELVIN_TO_CELSIUS(

			return sprintf(buf, "%ld\n", KELVIN_TO_MILLICELSIUS(

				tz->trips.critical.temperature));

		trip--;

	}



	if (tz->trips.hot.flags.valid) {

		if (!trip)

			return sprintf(buf, "%ld\n", KELVIN_TO_CELSIUS(

			return sprintf(buf, "%ld\n", KELVIN_TO_MILLICELSIUS(

					tz->trips.hot.temperature));

		trip--;

	}



	if (tz->trips.passive.flags.valid) {

		if (!trip)

			return sprintf(buf, "%ld\n", KELVIN_TO_CELSIUS(

			return sprintf(buf, "%ld\n", KELVIN_TO_MILLICELSIUS(

					tz->trips.passive.temperature));

		trip--;

	}
@@ -1002,7 +1004,7 @@ static int thermal_get_trip_temp(struct thermal_zone_device *thermal, 
	for (i = 0; i < ACPI_THERMAL_MAX_ACTIVE &&

		tz->trips.active[i].flags.valid; i++) {

		if (!trip)

			return sprintf(buf, "%ld\n", KELVIN_TO_CELSIUS(

			return sprintf(buf, "%ld\n", KELVIN_TO_MILLICELSIUS(

					tz->trips.active[i].temperature));

		trip--;

	}