[084/118] platform/x86: intel_menlow: 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: platform/x86: intel_menlow: switch to use <linux/units.h> helpers

This switches the intel_menlow driver to use deci_kelvin_to_celsius() and
celsius_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>.

This also removes a trailing space, while we're at it.

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/platform/x86/intel_menlow.c |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

Patch

--- a/drivers/platform/x86/intel_menlow.c~platform-x86-intel_menlow-switch-to-use-linux-unitsh-helpers
+++ a/drivers/platform/x86/intel_menlow.c
@@ -22,6 +22,7 @@ 
 #include <linux/slab.h>
 #include <linux/thermal.h>
 #include <linux/types.h>
+#include <linux/units.h>
 
 MODULE_AUTHOR("Thomas Sujith");
 MODULE_AUTHOR("Zhang Rui");
@@ -302,8 +303,10 @@  static ssize_t aux_show(struct device *d
 	int result;
 
 	result = sensor_get_auxtrip(attr->handle, idx, &value);
+	if (result)
+		return result;
 
-	return result ? result : sprintf(buf, "%lu", DECI_KELVIN_TO_CELSIUS(value));
+	return sprintf(buf, "%lu", deci_kelvin_to_celsius(value));
 }
 
 static ssize_t aux0_show(struct device *dev,
@@ -332,8 +335,8 @@  static ssize_t aux_store(struct device *
 	if (value < 0)
 		return -EINVAL;
 
-	result = sensor_set_auxtrip(attr->handle, idx, 
-				    CELSIUS_TO_DECI_KELVIN(value));
+	result = sensor_set_auxtrip(attr->handle, idx,
+				    celsius_to_deci_kelvin(value));
 	return result ? result : count;
 }