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
Cc: Amit Kucheria <amit.kucheria@verdurent.com>,
Jean Delvare <jdelvare@suse.com>,
Sagi Grimberg <sagi@grimberg.me>,
Sujith Thomas <sujith.thomas@intel.com>,
Daniel Lezcano <daniel.lezcano@linaro.org>,
Akinobu Mita <akinobu.mita@gmail.com>, Jens Axboe <axboe@fb.com>,
Guenter Roeck <linux@roeck-us.net>,
Keith Busch <kbusch@kernel.org>,
Darren Hart <dvhart@infradead.org>,
Zhang Rui <rui.zhang@intel.com>, Christoph Hellwig <hch@lst.de>,
Andy Shevchenko <andy@infradead.org>
Subject: [PATCH v3 07/12] nvme: hwmon: switch to use <linux/units.h> helpers
Date: Wed, 11 Dec 2019 23:38:14 +0900 [thread overview]
Message-ID: <1576075099-3441-8-git-send-email-akinobu.mita@gmail.com> (raw)
In-Reply-To: <1576075099-3441-1-git-send-email-akinobu.mita@gmail.com>
This switches the nvme driver to use kelvin_to_millicelsius() and
millicelsius_to_kelvin() in <linux/units.h>.
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: Christoph Hellwig <hch@lst.de>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
---
* v3
- rename new header name from <linux/temperature.h> to <linux/units.h>
drivers/nvme/host/hwmon.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/drivers/nvme/host/hwmon.c b/drivers/nvme/host/hwmon.c
index a5af21f..2e6477e 100644
--- a/drivers/nvme/host/hwmon.c
+++ b/drivers/nvme/host/hwmon.c
@@ -5,14 +5,11 @@
*/
#include <linux/hwmon.h>
+#include <linux/units.h>
#include <asm/unaligned.h>
#include "nvme.h"
-/* These macros should be moved to linux/temperature.h */
-#define MILLICELSIUS_TO_KELVIN(t) DIV_ROUND_CLOSEST((t) + 273150, 1000)
-#define KELVIN_TO_MILLICELSIUS(t) ((t) * 1000L - 273150)
-
struct nvme_hwmon_data {
struct nvme_ctrl *ctrl;
struct nvme_smart_log log;
@@ -35,7 +32,7 @@ static int nvme_get_temp_thresh(struct nvme_ctrl *ctrl, int sensor, bool under,
return -EIO;
if (ret < 0)
return ret;
- *temp = KELVIN_TO_MILLICELSIUS(status & NVME_TEMP_THRESH_MASK);
+ *temp = kelvin_to_millicelsius(status & NVME_TEMP_THRESH_MASK);
return 0;
}
@@ -46,7 +43,7 @@ static int nvme_set_temp_thresh(struct nvme_ctrl *ctrl, int sensor, bool under,
unsigned int threshold = sensor << NVME_TEMP_THRESH_SELECT_SHIFT;
int ret;
- temp = MILLICELSIUS_TO_KELVIN(temp);
+ temp = millicelsius_to_kelvin(temp);
threshold |= clamp_val(temp, 0, NVME_TEMP_THRESH_MASK);
if (under)
@@ -88,7 +85,7 @@ static int nvme_hwmon_read(struct device *dev, enum hwmon_sensor_types type,
case hwmon_temp_min:
return nvme_get_temp_thresh(data->ctrl, channel, true, val);
case hwmon_temp_crit:
- *val = KELVIN_TO_MILLICELSIUS(data->ctrl->cctemp);
+ *val = kelvin_to_millicelsius(data->ctrl->cctemp);
return 0;
default:
break;
@@ -105,7 +102,7 @@ static int nvme_hwmon_read(struct device *dev, enum hwmon_sensor_types type,
temp = get_unaligned_le16(log->temperature);
else
temp = le16_to_cpu(log->temp_sensor[channel - 1]);
- *val = KELVIN_TO_MILLICELSIUS(temp);
+ *val = kelvin_to_millicelsius(temp);
break;
case hwmon_temp_alarm:
*val = !!(log->critical_warning & NVME_SMART_CRIT_TEMPERATURE);
--
2.7.4
_______________________________________________
linux-nvme mailing list
linux-nvme@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-nvme
next prev parent reply other threads:[~2019-12-11 14:40 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-11 14:38 [PATCH v3 00/12] add header file for kelvin to/from Celsius conversion helpers Akinobu Mita
2019-12-11 14:38 ` [PATCH v3 01/12] add helpers for kelvin to/from Celsius conversion Akinobu Mita
2019-12-11 14:38 ` [PATCH v3 02/12] ACPI: thermal: switch to use <linux/units.h> helpers Akinobu Mita
2019-12-11 15:29 ` Andy Shevchenko
2019-12-13 4:03 ` Akinobu Mita
2019-12-13 9:08 ` Andy Shevchenko
2019-12-11 14:38 ` [PATCH v3 03/12] platform/x86: asus-wmi: " Akinobu Mita
2019-12-11 15:31 ` Andy Shevchenko
2019-12-13 4:06 ` Akinobu Mita
2019-12-13 9:05 ` Andy Shevchenko
2019-12-11 14:38 ` [PATCH v3 04/12] platform/x86: intel_menlow: " Akinobu Mita
2019-12-11 14:38 ` [PATCH v3 05/12] thermal: int340x: " Akinobu Mita
2019-12-11 14:38 ` [PATCH v3 06/12] thermal: intel_pch: " Akinobu Mita
2019-12-11 14:38 ` Akinobu Mita [this message]
2019-12-11 14:38 ` [PATCH v3 08/12] thermal: remove kelvin to/from Celsius conversion helpers from <linux/thermal.h> Akinobu Mita
2019-12-11 14:38 ` [PATCH v3 09/12] wireless: iwlegacy: use <linux/units.h> helpers Akinobu Mita
2019-12-12 9:35 ` Kalle Valo
2019-12-11 14:38 ` [PATCH v3 10/12] wireless: iwlwifi: " Akinobu Mita
2019-12-13 9:21 ` Luca Coelho
2019-12-11 14:38 ` [PATCH v3 11/12] thermal: armada: remove unused TO_MCELSIUS macro Akinobu Mita
2019-12-11 14:38 ` [PATCH v3 12/12] iio: adc: qcom-vadc-common: use <linux/units.h> helpers Akinobu Mita
2019-12-11 15:34 ` [PATCH v3 00/12] add header file for kelvin to/from Celsius conversion helpers Andy Shevchenko
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=1576075099-3441-8-git-send-email-akinobu.mita@gmail.com \
--to=akinobu.mita@gmail.com \
--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).