From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3FDAAC432C3 for ; Sun, 24 Nov 2019 14:10:54 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DE8A02073F for ; Sun, 24 Nov 2019 14:10:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="mUHr/hfm"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Kz9sL7W0" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DE8A02073F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=FKJTvRY5pNCxaQ0cTg+fXzy6sgnKfVd3oE9hPzxCrxo=; b=mUHr/hfmakjevNx/JMGyfjtODB pWnW56B3ySSeK8Lp1lEdhc3XxjErg4ul6/uCZVYGn8LXQ0hi7sE5kjyUEbQg0gdijUzHUzBBrFlQq wPsp5rT9frHQFTd8BZnZWz+fbHsCGrx6/Tuxr4TM/dHPE5tdTCzpSSa33TgBivgsT/7LCxBOzTpl1 D2lT4f42PYQsqzXjcGnuW7MNmWbSg6cD3bbGcnUps68ue2qMd3po7VzrnbfTlpK2rCX4uoQqgP30O 0TlbJh1Gn2RlXAzRbbYsCYHT56PbwEc3RQlX4S9KZ78VIb/VTBrOkCpzg50UQbDZPZDPkEsCYt8i9 6J7Xe6dQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iYsbC-0005iV-PH; Sun, 24 Nov 2019 14:10:50 +0000 Received: from mail-pl1-x644.google.com ([2607:f8b0:4864:20::644]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iYsaA-0003iT-3I for linux-nvme@lists.infradead.org; Sun, 24 Nov 2019 14:10:00 +0000 Received: by mail-pl1-x644.google.com with SMTP id f9so5274983plr.7 for ; Sun, 24 Nov 2019 06:09:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=U1P9v0dgTe+tqKEsZgzPVW6SYco9pFADyOLzbri3i3o=; b=Kz9sL7W0b88wM7v84z7h9smblf5jN9O8ktOA2awNOw8mBpflPc+/KSgNWvJtEN9Ys9 F4f/oAx+sunNNg1ZCGyUoZ0cRahUe7xMkKoBBzzVL83qK04vDVVayv/fI572plwAZAVt QcWAv2kgKRwnNRcmwZej3IE7khJ3gNLjgY3taNMMwSC87PUZMYnLER+H6Ho5WDt2MAX+ Dv5wZ6nj2hqLceXsekhF2bJ5GKXM9524Y2jZeLp6KaQLn9GGF/dsvC9mg7zmdStAiEuH KoZX83cxCGrf+U3VhwMQ1D1ymU6lYc59Kv9iEwZzprN8ENNvO24N0mBR/rvarKRQTg2B 7IVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=U1P9v0dgTe+tqKEsZgzPVW6SYco9pFADyOLzbri3i3o=; b=Drj/lumDULbUoXac6h+VE4ZAr3t6qqZXDkqNsy8OAdjJ1a2eHLfni0MXi8nsFNdTCF BNKnOzXdjAIpgkj1PoHyTMKYz/k7KTb4WSk5MT/pB1Bxsd7ntwG+qEhPgEWBQHS7a0Nf 94lWZPT/kbEyNaCG2kQ79CoBSBmOo3m+CB/+FBPA9bX5gl/suXz1Y4C9Cc3uvrrxZgkA JCUlJgWstYw+ZX8r5MKclCJ4QRVE8cgkUCs+UrpYyyxKx5apHVP4GO8CtPpIGpbzV10Z WWMPOCOXgeYcEbywHuJMNY6tZVpFrzr0a2w0KEedgNxCo79AAgiNo6LtskU1Kzse9s0m A7Gg== X-Gm-Message-State: APjAAAUh98bWEaQ5LcKmlAkZRCaTz66s+GUKM17i9l5xiydKKUr8CodQ 0AaAazeurMhY3cK01dTRomz8eCbireo= X-Google-Smtp-Source: APXvYqxcF5r37Oiwyu5+ys9DsjUH1+Liw6DJ02nCZXdgEGvValZg9tQzOwytoD8owu4j8zGYh/CBlA== X-Received: by 2002:a17:902:7c8f:: with SMTP id y15mr23001423pll.341.1574604584222; Sun, 24 Nov 2019 06:09:44 -0800 (PST) Received: from localhost.localdomain ([240f:34:212d:1:368e:e048:68f1:84e7]) by smtp.gmail.com with ESMTPSA id a3sm4816326pgh.91.2019.11.24.06.09.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 24 Nov 2019 06:09:43 -0800 (PST) From: Akinobu Mita To: linux-nvme@lists.infradead.org, linux-hwmon@vger.kernel.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 7/8] nvme: hwmon: switch to use helpers Date: Sun, 24 Nov 2019 23:08:49 +0900 Message-Id: <1574604530-9024-8-git-send-email-akinobu.mita@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1574604530-9024-1-git-send-email-akinobu.mita@gmail.com> References: <1574604530-9024-1-git-send-email-akinobu.mita@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191124_060946_165962_5E661EC4 X-CRM114-Status: GOOD ( 15.53 ) X-BeenThere: linux-nvme@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jens Axboe , Amit Kucheria , Jean Delvare , Sagi Grimberg , Sujith Thomas , Daniel Lezcano , Akinobu Mita , Eduardo Valentin , Guenter Roeck , Keith Busch , Darren Hart , Zhang Rui , Christoph Hellwig , Andy Shevchenko MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "Linux-nvme" Errors-To: linux-nvme-bounces+linux-nvme=archiver.kernel.org@lists.infradead.org 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: Eduardo Valentin Cc: Daniel Lezcano Cc: Amit Kucheria Cc: Jean Delvare Cc: Guenter Roeck Cc: Keith Busch Cc: Jens Axboe Cc: Christoph Hellwig Cc: Sagi Grimberg Signed-off-by: Akinobu Mita --- 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); -- 2.7.4 _______________________________________________ Linux-nvme mailing list Linux-nvme@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-nvme