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: Emmanuel Grumbach <emmanuel.grumbach@intel.com>,
Johannes Berg <johannes.berg@intel.com>,
Intel Linux Wireless <linuxwifi@intel.com>,
Akinobu Mita <akinobu.mita@gmail.com>,
Luca Coelho <luciano.coelho@intel.com>,
Kalle Valo <kvalo@codeaurora.org>
Subject: [PATCH v3 10/12] wireless: iwlwifi: use <linux/units.h> helpers
Date: Wed, 11 Dec 2019 23:38:17 +0900 [thread overview]
Message-ID: <1576075099-3441-11-git-send-email-akinobu.mita@gmail.com> (raw)
In-Reply-To: <1576075099-3441-1-git-send-email-akinobu.mita@gmail.com>
This switches the iwlwifi driver to use celsius_to_kelvin() and
kelvin_to_celsius() in <linux/units.h>.
Cc: Kalle Valo <kvalo@codeaurora.org>
Cc: Johannes Berg <johannes.berg@intel.com>
Cc: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Cc: Luca Coelho <luciano.coelho@intel.com>
Cc: Intel Linux Wireless <linuxwifi@intel.com>
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
---
* New patch from v3
drivers/net/wireless/intel/iwlwifi/dvm/dev.h | 5 -----
drivers/net/wireless/intel/iwlwifi/dvm/devices.c | 6 ++++--
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/dev.h b/drivers/net/wireless/intel/iwlwifi/dvm/dev.h
index be5ef4c..8d83800 100644
--- a/drivers/net/wireless/intel/iwlwifi/dvm/dev.h
+++ b/drivers/net/wireless/intel/iwlwifi/dvm/dev.h
@@ -237,11 +237,6 @@ struct iwl_sensitivity_ranges {
u16 nrg_th_cca;
};
-
-#define KELVIN_TO_CELSIUS(x) ((x)-273)
-#define CELSIUS_TO_KELVIN(x) ((x)+273)
-
-
/******************************************************************************
*
* Functions implemented in core module which are forward declared here
diff --git a/drivers/net/wireless/intel/iwlwifi/dvm/devices.c b/drivers/net/wireless/intel/iwlwifi/dvm/devices.c
index dc3f197..d42bc46 100644
--- a/drivers/net/wireless/intel/iwlwifi/dvm/devices.c
+++ b/drivers/net/wireless/intel/iwlwifi/dvm/devices.c
@@ -10,6 +10,8 @@
*
*****************************************************************************/
+#include <linux/units.h>
+
/*
* DVM device-specific data & functions
*/
@@ -345,7 +347,7 @@ static s32 iwl_temp_calib_to_offset(struct iwl_priv *priv)
static void iwl5150_set_ct_threshold(struct iwl_priv *priv)
{
const s32 volt2temp_coef = IWL_5150_VOLTAGE_TO_TEMPERATURE_COEFF;
- s32 threshold = (s32)CELSIUS_TO_KELVIN(CT_KILL_THRESHOLD_LEGACY) -
+ s32 threshold = (s32)celsius_to_kelvin(CT_KILL_THRESHOLD_LEGACY) -
iwl_temp_calib_to_offset(priv);
priv->hw_params.ct_kill_threshold = threshold * volt2temp_coef;
@@ -381,7 +383,7 @@ static void iwl5150_temperature(struct iwl_priv *priv)
vt = le32_to_cpu(priv->statistics.common.temperature);
vt = vt / IWL_5150_VOLTAGE_TO_TEMPERATURE_COEFF + offset;
/* now vt hold the temperature in Kelvin */
- priv->temperature = KELVIN_TO_CELSIUS(vt);
+ priv->temperature = kelvin_to_celsius(vt);
iwl_tt_handler(priv);
}
--
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:55 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 ` [PATCH v3 07/12] nvme: hwmon: " Akinobu Mita
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 ` Akinobu Mita [this message]
2019-12-13 9:21 ` [PATCH v3 10/12] wireless: iwlwifi: " 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-11-git-send-email-akinobu.mita@gmail.com \
--to=akinobu.mita@gmail.com \
--cc=emmanuel.grumbach@intel.com \
--cc=johannes.berg@intel.com \
--cc=kvalo@codeaurora.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=linuxwifi@intel.com \
--cc=luciano.coelho@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).