On Sun, Nov 24, 2019 at 4:09 PM Akinobu Mita <akinobu.mita@xxxxxxxxx> wrote: > > The asus-wmi driver doesn't implement the thermal device functionality > directly, so including <linux/thermal.h> just for DECI_KELVIN_TO_CELSIUS() > is a bit odd. > > This switches the asus-wmi driver to use deci_kelvin_to_millicelsius() in > <linux/temperature.h>. > > Cc: Sujith Thomas <sujith.thomas@xxxxxxxxx> > Cc: Darren Hart <dvhart@xxxxxxxxxxxxx> > Cc: Andy Shevchenko <andy@xxxxxxxxxxxxx> > Cc: Zhang Rui <rui.zhang@xxxxxxxxx> > Cc: Eduardo Valentin <edubezval@xxxxxxxxx> > Cc: Daniel Lezcano <daniel.lezcano@xxxxxxxxxx> > Cc: Amit Kucheria <amit.kucheria@xxxxxxxxxxxxx> > Cc: Jean Delvare <jdelvare@xxxxxxxx> > Cc: Guenter Roeck <linux@xxxxxxxxxxxx> > Cc: Keith Busch <kbusch@xxxxxxxxxx> > Cc: Jens Axboe <axboe@xxxxxx> > Cc: Christoph Hellwig <hch@xxxxxx> > Cc: Sagi Grimberg <sagi@xxxxxxxxxxx> > Signed-off-by: Akinobu Mita <akinobu.mita@xxxxxxxxx> > --- > drivers/platform/x86/asus-wmi.c | 7 +++---- > 1 file changed, 3 insertions(+), 4 deletions(-) > > diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c > index 821b08e..6a1a2f9 100644 > --- a/drivers/platform/x86/asus-wmi.c > +++ b/drivers/platform/x86/asus-wmi.c > @@ -33,7 +33,7 @@ > #include <linux/seq_file.h> > #include <linux/platform_data/x86/asus-wmi.h> > #include <linux/platform_device.h> > -#include <linux/thermal.h> > +#include <linux/temperature.h> > #include <linux/acpi.h> > #include <linux/dmi.h> > > @@ -1512,9 +1512,8 @@ static ssize_t asus_hwmon_temp1(struct device *dev, > if (err < 0) > return err; > > - value = DECI_KELVIN_TO_CELSIUS((value & 0xFFFF)) * 1000; > - > - return sprintf(buf, "%d\n", value); > + return sprintf(buf, "%ld\n", > + deci_kelvin_to_millicelsius(value & 0xFFFF)); Leave it in one line. With above, Acked-by: Andy Shevchenko <andy.shevchenko@xxxxxxxxx> > } > > /* Fan1 */ > -- > 2.7.4 > -- With Best Regards, Andy Shevchenko
