From: Akinobu Mita <akinobu.mita@gmail.com>
To: linux-nvme@lists.infradead.org, linux-hwmon@vger.kernel.org,
linux-pm@vger.kernel.org, linux-wireless@vger.kernel.org,
linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org,
akpm@linux-foundation.org
Cc: Akinobu Mita <akinobu.mita@gmail.com>,
Sujith Thomas <sujith.thomas@intel.com>,
Darren Hart <dvhart@infradead.org>,
Andy Shevchenko <andy@infradead.org>,
Zhang Rui <rui.zhang@intel.com>,
Daniel Lezcano <daniel.lezcano@linaro.org>,
Amit Kucheria <amit.kucheria@verdurent.com>,
Jean Delvare <jdelvare@suse.com>,
Guenter Roeck <linux@roeck-us.net>,
Keith Busch <kbusch@kernel.org>, Jens Axboe <axboe@fb.com>,
Christoph Hellwig <hch@lst.de>, Sagi Grimberg <sagi@grimberg.me>
Subject: [PATCH v4 04/12] platform/x86: intel_menlow: switch to use <linux/units.h> helpers
Date: Sun, 15 Dec 2019 14:16:07 +0900 [thread overview]
Message-ID: <1576386975-7941-5-git-send-email-akinobu.mita@gmail.com> (raw)
In-Reply-To: <1576386975-7941-1-git-send-email-akinobu.mita@gmail.com>
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.
Cc: Sujith Thomas <sujith.thomas@intel.com>
Cc: Darren Hart <dvhart@infradead.org>
Cc: Andy Shevchenko <andy@infradead.org>
Cc: Zhang Rui <rui.zhang@intel.com>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Amit Kucheria <amit.kucheria@verdurent.com>
Cc: Jean Delvare <jdelvare@suse.com>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: Keith Busch <kbusch@kernel.org>
Cc: Jens Axboe <axboe@fb.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
---
* No changes from v3
drivers/platform/x86/intel_menlow.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/drivers/platform/x86/intel_menlow.c b/drivers/platform/x86/intel_menlow.c
index b102f6d..101d7e7 100644
--- a/drivers/platform/x86/intel_menlow.c
+++ b/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 *dev, struct device_attribute *dev_attr,
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 *dev, struct device_attribute *dev_attr,
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;
}
--
2.7.4
next prev parent reply other threads:[~2019-12-15 5:17 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-15 5:16 [PATCH v4 00/12] add header file for kelvin to/from Celsius conversion helpers Akinobu Mita
2019-12-15 5:16 ` [PATCH v4 01/12] add helpers for kelvin to/from Celsius conversion Akinobu Mita
2019-12-15 5:16 ` [PATCH v4 02/12] ACPI: thermal: switch to use <linux/units.h> helpers Akinobu Mita
2019-12-15 5:16 ` [PATCH v4 03/12] platform/x86: asus-wmi: " Akinobu Mita
2019-12-15 5:16 ` Akinobu Mita [this message]
2019-12-15 5:16 ` [PATCH v4 05/12] thermal: int340x: " Akinobu Mita
2019-12-15 5:16 ` [PATCH v4 06/12] thermal: intel_pch: " Akinobu Mita
2019-12-15 5:16 ` [PATCH v4 07/12] nvme: hwmon: " Akinobu Mita
2019-12-15 5:16 ` [PATCH v4 08/12] thermal: remove kelvin to/from Celsius conversion helpers from <linux/thermal.h> Akinobu Mita
2019-12-15 5:16 ` [PATCH v4 09/12] iwlegacy: use <linux/units.h> helpers Akinobu Mita
2019-12-15 5:16 ` [PATCH v4 10/12] iwlwifi: " Akinobu Mita
2019-12-15 5:16 ` [PATCH v4 11/12] thermal: armada: remove unused TO_MCELSIUS macro Akinobu Mita
2019-12-15 5:16 ` [PATCH v4 12/12] iio: adc: qcom-vadc-common: use <linux/units.h> helpers Akinobu Mita
2019-12-15 12:29 ` Jonathan Cameron
2019-12-23 13:07 ` [PATCH v4 00/12] add header file for kelvin to/from Celsius conversion helpers Akinobu Mita
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1576386975-7941-5-git-send-email-akinobu.mita@gmail.com \
--to=akinobu.mita@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=amit.kucheria@verdurent.com \
--cc=andy@infradead.org \
--cc=axboe@fb.com \
--cc=daniel.lezcano@linaro.org \
--cc=dvhart@infradead.org \
--cc=hch@lst.de \
--cc=jdelvare@suse.com \
--cc=kbusch@kernel.org \
--cc=linux-hwmon@vger.kernel.org \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nvme@lists.infradead.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=rui.zhang@intel.com \
--cc=sagi@grimberg.me \
--cc=sujith.thomas@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).