Received: by 2002:a25:7ec1:0:0:0:0:0 with SMTP id z184csp6896923ybc; Thu, 28 Nov 2019 07:18:16 -0800 (PST) X-Google-Smtp-Source: APXvYqwDuDjVoOgGoteuhXghdkXqgUdraQxJxZ0Ux75i8GxubaiIx6UNd5shV/Jkxq/g4ENaRUPP X-Received: by 2002:a17:906:692:: with SMTP id u18mr1308588ejb.295.1574954296418; Thu, 28 Nov 2019 07:18:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574954296; cv=none; d=google.com; s=arc-20160816; b=SOoVuoLzZxUsWdN9XsTNpXhW1GEPyPmAli3rf0P2iR+c0s0AskQpGpLdEI9w3oYgLd 9+TagEEVbXFZL+wWs3snTFvlDrGSXuKNJs1EdxG5tY/LtOCysw/ihtPAP3e+oEMVTS3F jV02IzHYYr9Uput0/O6WYdtsLXmPMkYKLrEI/YLIYiXXa88Tw2iud6+q45riL/wHonJ3 endzaTwO5SAq4QruV+rcSTX4A46PuG4q2KllPc1jGlbXWnLSpVnGWvCo7f/6XnSJMFBk VvjQCbVYpc2UfFUOhVJaJTvUGYoh4w3S4iBetiGaBiccOsrv96afpKZi+WrBd1YUDSUF ulBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding :content-language:in-reply-to:mime-version:user-agent:date :message-id:from:references:cc:to:subject:dkim-signature; bh=HtuUzrcYCx4FDKvEYRGNCE7CBoyzQfGcKVK/4Fc5Xdo=; b=balN/yv2XSJrcXZJPLlkArlqbgZZCOGqMRGuE48isopbJPlnLXVHL5NIyfqtQ0Di6a Nb+kANNCAEqugaD8lQE+JHnb+5RVrvvtckXqQRNMycBxlFZacGxGuU5TX0udiy2Tg4Rq Fs0ekz6Jd458g9fSv59/SsL4DWHGajrSGhnwhhX2PBBEsYBO3PPnVhfpTotWmPaQxlwq w5W2XYEDH2+a1FlfgkYoTdtava6BaCJqngkQxXsKzrg1bROFLjLTznNRa2D4MGjpZhty EU4h91YULO0PU1gMLvkZ4l399IyiE2lCrSVXNdY+myPOiX+2xyPm48R0f31k8ZG9z+y/ 153A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b="U7H/vMgH"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e12si11902221ejq.112.2019.11.28.07.17.52; Thu, 28 Nov 2019 07:18:16 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b="U7H/vMgH"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726656AbfK1POH (ORCPT + 99 others); Thu, 28 Nov 2019 10:14:07 -0500 Received: from mail-ot1-f65.google.com ([209.85.210.65]:38236 "EHLO mail-ot1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726436AbfK1POG (ORCPT ); Thu, 28 Nov 2019 10:14:06 -0500 Received: by mail-ot1-f65.google.com with SMTP id z25so22470945oti.5; Thu, 28 Nov 2019 07:14:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=HtuUzrcYCx4FDKvEYRGNCE7CBoyzQfGcKVK/4Fc5Xdo=; b=U7H/vMgHKUQfGCWIqsAc2hDHGYhdMRtA9d/x76Mk5bgXtAUHQYEQezz4KCmwjzRW3Q +hsmclBS9eH14K21262FlXFPBytrKVmtqE6z5p3Mhr0hBRSz6Z0pzVEFti39PLc/XAxR zhD+DjtkdgHLUyMGBNkFnUDJXEDRhysdooejFjchqAbk1nkr7MKaHCVY0WU/efzuvrsy f7sb0aw+V9v5w/zyksxHwYqHPfyNJvAnODn4HLzBofYH0/kjvpWUixCFUvHR0Kn2JOBg AJvdKW3wjpEhw10cyE8N83V/fU3TEDHS51QKDX7k+/MRSvBF6VZIQ9wkkGDnU6m7vv3p 18+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:subject:to:cc:references:from:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=HtuUzrcYCx4FDKvEYRGNCE7CBoyzQfGcKVK/4Fc5Xdo=; b=uXDEK99CBKoKMznmkMemSpWODYPBfqA9C7TAj3uo13oa0cnETkMP4GeNbPK7z8vv0P 0viMPthldYPnFxEKHUKgYpqFDWjGUMyztXcynZfqCRFuQulhrKsSz23PQXY38iAQO5Or TcnSSk2ZPap0X8wyyOCERj86/S6ZrFPrHB2RfvxmNwtGIOohMQT6Oq8/tj38pdsP6PDF S5OyT+BBDTqzUjysyj8S7ExeWg24tupUvGbUYSZax8asraIMo9KLMNMFft8brNUxjupk yzioJC087Z3g6x0thcaVmFCC/HRdzPB9DrrvUnXHeQadv6x/GA6CdT5JWPVWelKwz8pS 9q0w== X-Gm-Message-State: APjAAAX0BuTn6Oaiz0LdBoQ15nT8dgLS0BlPlbDY9VPrC5xDe4ZlUEAQ BAmikxcFCZ2VUqVi2r9RsPg= X-Received: by 2002:a05:6830:46:: with SMTP id d6mr8123426otp.7.1574954045573; Thu, 28 Nov 2019 07:14:05 -0800 (PST) Received: from server.roeck-us.net ([2600:1700:e321:62f0:329c:23ff:fee3:9d7c]) by smtp.gmail.com with ESMTPSA id l73sm2613001oib.0.2019.11.28.07.14.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Nov 2019 07:14:04 -0800 (PST) Subject: Re: [PATCH v2 7/8] nvme: hwmon: switch to use helpers To: Akinobu Mita , linux-nvme@lists.infradead.org, linux-hwmon@vger.kernel.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Sujith Thomas , Darren Hart , Andy Shevchenko , Zhang Rui , Daniel Lezcano , Amit Kucheria , Jean Delvare , Keith Busch , Jens Axboe , Christoph Hellwig , Sagi Grimberg References: <1574952879-7200-1-git-send-email-akinobu.mita@gmail.com> <1574952879-7200-8-git-send-email-akinobu.mita@gmail.com> From: Guenter Roeck Message-ID: <479c99fe-51c6-910f-4471-4883de4cfd21@roeck-us.net> Date: Thu, 28 Nov 2019 07:14:02 -0800 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.9.0 MIME-Version: 1.0 In-Reply-To: <1574952879-7200-8-git-send-email-akinobu.mita@gmail.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 11/28/19 6:54 AM, Akinobu Mita wrote: > This switches the nvme driver to use kelvin_to_millicelsius() and > millicelsius_to_kelvin() in . > > Cc: Sujith Thomas > Cc: Darren Hart > Cc: Andy Shevchenko > Cc: Zhang Rui > Cc: Daniel Lezcano > Cc: Amit Kucheria > Cc: Jean Delvare > Cc: Guenter Roeck > Cc: Keith Busch > Cc: Jens Axboe > Cc: Christoph Hellwig > Cc: Sagi Grimberg > Reviewed-by: Christoph Hellwig > Signed-off-by: Akinobu Mita Reviewed-by: Guenter Roeck > --- > * v2 > - add Reviewed-by tag > > 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..14720c1 100644 > --- a/drivers/nvme/host/hwmon.c > +++ b/drivers/nvme/host/hwmon.c > @@ -5,14 +5,11 @@ > */ > > #include > +#include > #include > > #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); >