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,
akpm@linux-foundation.org
Cc: Akinobu Mita <akinobu.mita@gmail.com>,
Kalle Valo <kvalo@codeaurora.org>,
Stanislaw Gruszka <sgruszka@redhat.com>
Subject: [PATCH v4 09/12] iwlegacy: use <linux/units.h> helpers
Date: Sun, 15 Dec 2019 14:16:12 +0900 [thread overview]
Message-ID: <1576386975-7941-10-git-send-email-akinobu.mita@gmail.com> (raw)
In-Reply-To: <1576386975-7941-1-git-send-email-akinobu.mita@gmail.com>
This switches the iwlegacy driver to use celsius_to_kelvin() and
kelvin_to_celsius() in <linux/units.h>.
Cc: Kalle Valo <kvalo@codeaurora.org>
Cc: Stanislaw Gruszka <sgruszka@redhat.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Acked-by: Kalle Valo <kvalo@codeaurora.org>
Signed-off-by: Akinobu Mita <akinobu.mita@gmail.com>
---
* v4
- add Reviewed-by and Acked-by tags
- remove "wireless: " in the title
drivers/net/wireless/intel/iwlegacy/4965-mac.c | 3 ++-
drivers/net/wireless/intel/iwlegacy/4965.c | 11 ++++++-----
drivers/net/wireless/intel/iwlegacy/common.h | 3 ---
3 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/drivers/net/wireless/intel/iwlegacy/4965-mac.c b/drivers/net/wireless/intel/iwlegacy/4965-mac.c
index 3664f56..d6766eb 100644
--- a/drivers/net/wireless/intel/iwlegacy/4965-mac.c
+++ b/drivers/net/wireless/intel/iwlegacy/4965-mac.c
@@ -27,6 +27,7 @@
#include <linux/firmware.h>
#include <linux/etherdevice.h>
#include <linux/if_arp.h>
+#include <linux/units.h>
#include <net/mac80211.h>
@@ -6467,7 +6468,7 @@ il4965_set_hw_params(struct il_priv *il)
il->hw_params.valid_rx_ant = il->cfg->valid_rx_ant;
il->hw_params.ct_kill_threshold =
- CELSIUS_TO_KELVIN(CT_KILL_THRESHOLD_LEGACY);
+ celsius_to_kelvin(CT_KILL_THRESHOLD_LEGACY);
il->hw_params.sens = &il4965_sensitivity;
il->hw_params.beacon_time_tsf_bits = IL4965_EXT_BEACON_TIME_POS;
diff --git a/drivers/net/wireless/intel/iwlegacy/4965.c b/drivers/net/wireless/intel/iwlegacy/4965.c
index 32699b6..31b346c 100644
--- a/drivers/net/wireless/intel/iwlegacy/4965.c
+++ b/drivers/net/wireless/intel/iwlegacy/4965.c
@@ -17,6 +17,7 @@
#include <linux/sched.h>
#include <linux/skbuff.h>
#include <linux/netdevice.h>
+#include <linux/units.h>
#include <net/mac80211.h>
#include <linux/etherdevice.h>
#include <asm/unaligned.h>
@@ -1104,7 +1105,7 @@ il4965_fill_txpower_tbl(struct il_priv *il, u8 band, u16 channel, u8 is_ht40,
/* get current temperature (Celsius) */
current_temp = max(il->temperature, IL_TX_POWER_TEMPERATURE_MIN);
current_temp = min(il->temperature, IL_TX_POWER_TEMPERATURE_MAX);
- current_temp = KELVIN_TO_CELSIUS(current_temp);
+ current_temp = kelvin_to_celsius(current_temp);
/* select thermal txpower adjustment params, based on channel group
* (same frequency group used for mimo txatten adjustment) */
@@ -1611,7 +1612,7 @@ il4965_hw_get_temperature(struct il_priv *il)
(temperature * 97) / 100 + TEMPERATURE_CALIB_KELVIN_OFFSET;
D_TEMP("Calibrated temperature: %dK, %dC\n", temperature,
- KELVIN_TO_CELSIUS(temperature));
+ kelvin_to_celsius(temperature));
return temperature;
}
@@ -1671,11 +1672,11 @@ il4965_temperature_calib(struct il_priv *il)
if (il->temperature != temp) {
if (il->temperature)
D_TEMP("Temperature changed " "from %dC to %dC\n",
- KELVIN_TO_CELSIUS(il->temperature),
- KELVIN_TO_CELSIUS(temp));
+ kelvin_to_celsius(il->temperature),
+ kelvin_to_celsius(temp));
else
D_TEMP("Temperature " "initialized to %dC\n",
- KELVIN_TO_CELSIUS(temp));
+ kelvin_to_celsius(temp));
}
il->temperature = temp;
diff --git a/drivers/net/wireless/intel/iwlegacy/common.h b/drivers/net/wireless/intel/iwlegacy/common.h
index e7fb8e6..bc9cd7e 100644
--- a/drivers/net/wireless/intel/iwlegacy/common.h
+++ b/drivers/net/wireless/intel/iwlegacy/common.h
@@ -779,9 +779,6 @@ struct il_sensitivity_ranges {
u16 nrg_th_cca;
};
-#define KELVIN_TO_CELSIUS(x) ((x)-273)
-#define CELSIUS_TO_KELVIN(x) ((x)+273)
-
/**
* struct il_hw_params
* @bcast_id: f/w broadcast station ID
--
2.7.4
next prev parent reply other threads:[~2019-12-15 5:17 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-15 5:16 [PATCH v4 00/12] add header file for kelvin to/from Celsius conversion helpers Akinobu Mita
2019-12-15 5:16 ` [PATCH v4 01/12] add helpers for kelvin to/from Celsius conversion Akinobu Mita
2019-12-15 5:16 ` [PATCH v4 02/12] ACPI: thermal: switch to use <linux/units.h> helpers Akinobu Mita
2019-12-15 5:16 ` [PATCH v4 03/12] platform/x86: asus-wmi: " Akinobu Mita
2019-12-15 5:16 ` [PATCH v4 04/12] platform/x86: intel_menlow: " Akinobu Mita
2019-12-15 5:16 ` [PATCH v4 05/12] thermal: int340x: " Akinobu Mita
2019-12-15 5:16 ` [PATCH v4 06/12] thermal: intel_pch: " Akinobu Mita
2019-12-15 5:16 ` [PATCH v4 07/12] nvme: hwmon: " Akinobu Mita
2019-12-15 5:16 ` [PATCH v4 08/12] thermal: remove kelvin to/from Celsius conversion helpers from <linux/thermal.h> Akinobu Mita
2019-12-15 5:16 ` Akinobu Mita [this message]
2019-12-15 5:16 ` [PATCH v4 10/12] iwlwifi: use <linux/units.h> helpers Akinobu Mita
2019-12-15 5:16 ` [PATCH v4 11/12] thermal: armada: remove unused TO_MCELSIUS macro Akinobu Mita
2019-12-15 5:16 ` [PATCH v4 12/12] iio: adc: qcom-vadc-common: use <linux/units.h> helpers Akinobu Mita
2019-12-15 12:29 ` Jonathan Cameron
2019-12-23 13:07 ` [PATCH v4 00/12] add header file for kelvin to/from Celsius conversion helpers Akinobu Mita
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=1576386975-7941-10-git-send-email-akinobu.mita@gmail.com \
--to=akinobu.mita@gmail.com \
--cc=akpm@linux-foundation.org \
--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=sgruszka@redhat.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).