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

Commit 7b83fd9d authored by Aaron Lu's avatar Aaron Lu Committed by Zhang Rui
Browse files

Thermal: move the KELVIN_TO_MILLICELSIUS macro to thermal.h 



This macro can be used by other component so move it to a common header,
but in a slightly different way: define two macros, one macro with an
offset and the other doesn't.

Signed-off-by: default avatarAaron Lu <aaron.lu@intel.com>
Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
parent d806c6e9

drivers/acpi/thermal.c

+9 −9
Original line number Diff line number Diff line
@@ -528,7 +528,6 @@ static void acpi_thermal_check(void *data) 
}



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

#define KELVIN_TO_MILLICELSIUS(t, off) (((t) - (off)) * 100)



static int thermal_get_temp(struct thermal_zone_device *thermal,

			    unsigned long *temp)
@@ -543,7 +542,8 @@ static int thermal_get_temp(struct thermal_zone_device *thermal, 
	if (result)

		return result;



	*temp = KELVIN_TO_MILLICELSIUS(tz->temperature, tz->kelvin_offset);

	*temp = DECI_KELVIN_TO_MILLICELSIUS_WITH_OFFSET(tz->temperature,

							tz->kelvin_offset);

	return 0;

}
@@ -647,7 +647,7 @@ static int thermal_get_trip_temp(struct thermal_zone_device *thermal, 


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

		if (!trip) {

			*temp = KELVIN_TO_MILLICELSIUS(

			*temp = DECI_KELVIN_TO_MILLICELSIUS_WITH_OFFSET(

				tz->trips.critical.temperature,

				tz->kelvin_offset);

			return 0;
@@ -657,7 +657,7 @@ static int thermal_get_trip_temp(struct thermal_zone_device *thermal, 


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

		if (!trip) {

			*temp = KELVIN_TO_MILLICELSIUS(

			*temp = DECI_KELVIN_TO_MILLICELSIUS_WITH_OFFSET(

				tz->trips.hot.temperature,

				tz->kelvin_offset);

			return 0;
@@ -667,7 +667,7 @@ static int thermal_get_trip_temp(struct thermal_zone_device *thermal, 


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

		if (!trip) {

			*temp = KELVIN_TO_MILLICELSIUS(

			*temp = DECI_KELVIN_TO_MILLICELSIUS_WITH_OFFSET(

				tz->trips.passive.temperature,

				tz->kelvin_offset);

			return 0;
@@ -678,7 +678,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) {

			*temp = KELVIN_TO_MILLICELSIUS(

			*temp = DECI_KELVIN_TO_MILLICELSIUS_WITH_OFFSET(

				tz->trips.active[i].temperature,

				tz->kelvin_offset);

			return 0;
@@ -694,7 +694,7 @@ static int thermal_get_crit_temp(struct thermal_zone_device *thermal, 
	struct acpi_thermal *tz = thermal->devdata;



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

		*temperature = KELVIN_TO_MILLICELSIUS(

		*temperature = DECI_KELVIN_TO_MILLICELSIUS_WITH_OFFSET(

				tz->trips.critical.temperature,

				tz->kelvin_offset);

		return 0;
@@ -714,8 +714,8 @@ static int thermal_get_trend(struct thermal_zone_device *thermal, 


	if (type == THERMAL_TRIP_ACTIVE) {

		unsigned long trip_temp;

		unsigned long temp = KELVIN_TO_MILLICELSIUS(tz->temperature,

							tz->kelvin_offset);

		unsigned long temp = DECI_KELVIN_TO_MILLICELSIUS_WITH_OFFSET(

					tz->temperature, tz->kelvin_offset);

		if (thermal_get_trip_temp(thermal, trip, &trip_temp))

			return -EINVAL;

include/linux/thermal.h

+2 −0
Original line number Diff line number Diff line
@@ -44,6 +44,8 @@ 
#define KELVIN_TO_CELSIUS(t)	(long)(((long)t-2732 >= 0) ?	\

				((long)t-2732+5)/10 : ((long)t-2732-5)/10)

#define CELSIUS_TO_KELVIN(t)	((t)*10+2732)

#define DECI_KELVIN_TO_MILLICELSIUS_WITH_OFFSET(t, off) (((t) - (off)) * 100)

#define DECI_KELVIN_TO_MILLICELSIUS(t) DECI_KELVIN_TO_MILLICELSIUS_WITH_OFFSET(t, 2732)



/* Adding event notification support elements */

#define THERMAL_GENL_FAMILY_NAME                "thermal_event"