Merge tag 'nfsd-5.6' of git://linux-nfs.org/~bfields/linux

[linux.git] / drivers / nvme / host / hwmon.c

diff --git a/drivers/nvme/host/hwmon.c b/drivers/nvme/host/hwmon.c
index a5af21f5d3705ca390ec7fdcd85195a1c8d7fb97..2e6477ed420f6e6e0035159c5337438e9c78deda 100644 (file)
--- 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);