[085/118] thermal: int340x: switch to use <linux/units.h> helpers

Commit Message

Andrew Morton Jan. 31, 2020, 6:15 a.m. UTC

From: Akinobu Mita <[e-mail]>
Subject: thermal: int340x: switch to use <linux/units.h> helpers

This switches the int340x thermal zone driver to use
deci_kelvin_to_millicelsius() and millicelsius_to_deci_kelvin() in
<linux/units.h> instead of helpers in <linux/thermal.h>.

This is preparation for centralizing the kelvin to/from Celsius conversion
helpers in <linux/units.h>.

Link: http://lkml.kernel.org/r/[e-mail]
Signed-off-by: Akinobu Mita <[e-mail]>
Reviewed-by: Andy Shevchenko <[e-mail]>
Cc: Sujith Thomas <[e-mail]>
Cc: Darren Hart <[e-mail]>
Cc: Andy Shevchenko <[e-mail]>
Cc: Zhang Rui <[e-mail]>
Cc: Daniel Lezcano <[e-mail]>
Cc: Amit Kucheria <[e-mail]>
Cc: Jean Delvare <[e-mail]>
Cc: Guenter Roeck <[e-mail]>
Cc: Keith Busch <[e-mail]>
Cc: Jens Axboe <[e-mail]>
Cc: Christoph Hellwig <[e-mail]>
Cc: Sagi Grimberg <[e-mail]>
Cc: Emmanuel Grumbach <[e-mail]>
Cc: Hartmut Knaack <[e-mail]>
Cc: Johannes Berg <[e-mail]>
Cc: Jonathan Cameron <[e-mail]>
Cc: Jonathan Cameron <[e-mail]>
Cc: Kalle Valo <[e-mail]>
Cc: Lars-Peter Clausen <[e-mail]>
Cc: Luca Coelho <[e-mail]>
Cc: Peter Meerwald-Stadler <[e-mail]>
Cc: Stanislaw Gruszka <[e-mail]>
Signed-off-by: Andrew Morton <[e-mail]>
---

 drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

Patch

--- a/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c~thermal-int340x-switch-to-use-linux-unitsh-helpers
+++ a/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c
@@ -8,6 +8,7 @@ 
 #include <linux/init.h>
 #include <linux/acpi.h>
 #include <linux/thermal.h>
+#include <linux/units.h>
 #include "int340x_thermal_zone.h"
 
 static int int340x_thermal_get_zone_temp(struct thermal_zone_device *zone,
@@ -34,7 +35,7 @@  static int int340x_thermal_get_zone_temp
 		*temp = (unsigned long)conv_temp * 10;
 	} else
 		/* _TMP returns the temperature in tenths of degrees Kelvin */
-		*temp = DECI_KELVIN_TO_MILLICELSIUS(tmp);
+		*temp = deci_kelvin_to_millicelsius(tmp);
 
 	return 0;
 }
@@ -116,7 +117,7 @@  static int int340x_thermal_set_trip_temp
 
 	snprintf(name, sizeof(name), "PAT%d", trip);
 	status = acpi_execute_simple_method(d->adev->handle, name,
-			MILLICELSIUS_TO_DECI_KELVIN(temp));
+			millicelsius_to_deci_kelvin(temp));
 	if (ACPI_FAILURE(status))
 		return -EIO;
 
@@ -163,7 +164,7 @@  static int int340x_thermal_get_trip_conf
 	if (ACPI_FAILURE(status))
 		return -EIO;
 
-	*temp = DECI_KELVIN_TO_MILLICELSIUS(r);
+	*temp = deci_kelvin_to_millicelsius(r);
 
 	return 0;
 }