thermal-int340x-switch-to-use-linux-unitsh-helpers.patch removed from -mm tree
The patch titled
Subject: thermal: int340x: switch to use <linux/units.h> helpers
has been removed from the -mm tree. Its filename was
thermal-int340x-switch-to-use-linux-unitsh-helpers.patchThis patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Akinobu Mita <[email protected]>
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>.
Signed-off-by Akinobu Mita <[email protected]>
Reviewed-by Andy Shevchenko <[email protected]>
Cc Sujith Thomas <[email protected]>
Cc Darren Hart <[email protected]>
Cc Andy Shevchenko <[email protected]>
Cc Zhang Rui <[email protected]>
Cc Daniel Lezcano <[email protected]>
Cc Amit Kucheria <[email protected]>
Cc Jean Delvare <[email protected]>
Cc Guenter Roeck <[email protected]>
Cc Keith Busch <[email protected]>
Cc Jens Axboe <[email protected]>
Cc Christoph Hellwig <[email protected]>
Cc Sagi Grimberg <[email protected]>
Cc Emmanuel Grumbach <[email protected]>
Cc Hartmut Knaack <[email protected]>
Cc Johannes Berg <[email protected]>
Cc Jonathan Cameron <[email protected]>
Cc Jonathan Cameron <[email protected]>
Cc Kalle Valo <[email protected]>
Cc Lars-Peter Clausen <[email protected]>
Cc Luca Coelho <[email protected]>
Cc Peter Meerwald-Stadler <[email protected]>
Cc Stanislaw Gruszka <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c renamed from drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c~thermal-int340x-switch-to-use-linux-unitsh-helpers +4 -3
@@ -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_tempsnprintf (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_confif (ACPI_FAILURE (status))return -EIO ; - *temp =DECI_KELVIN_TO_MILLICELSIUS (r); + *temp =deci_kelvin_to_millicelsius (r);return 0 ; }
_
Patches currently in -mm which might be from [email protected] are