iwlwifi-use-linux-unitsh-helpers.patch removed from -mm tree
The patch titled
Subject: iwlwifi: use <linux/units.h> helpers
has been removed from the -mm tree. Its filename was
iwlwifi-use-linux-unitsh-helpers.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Akinobu Mita <[email protected]>
Subject: iwlwifi: use <linux/units.h> helpers
This switches the iwlwifi driver to use celsius_to_kelvin() and kelvin_to_celsius() in <linux/units.h>.
Signed-off-by Akinobu Mita <[email protected]>
Reviewed-by Andy Shevchenko <[email protected]>
Acked-by Luca Coelho <[email protected]>
Cc Kalle Valo <[email protected]>
Cc Johannes Berg <[email protected]>
Cc Emmanuel Grumbach <[email protected]>
Cc Luca Coelho <[email protected]>
Cc Amit Kucheria <[email protected]>
Cc Andy Shevchenko <[email protected]>
Cc Christoph Hellwig <[email protected]>
Cc Daniel Lezcano <[email protected]>
Cc Darren Hart <[email protected]>
Cc Guenter Roeck <[email protected]>
Cc Hartmut Knaack <[email protected]>
Cc Jean Delvare <[email protected]>
Cc Jens Axboe <[email protected]>
Cc Jonathan Cameron <[email protected]>
Cc Jonathan Cameron <[email protected]>
Cc Keith Busch <[email protected]>
Cc Lars-Peter Clausen <[email protected]>
Cc Peter Meerwald-Stadler <[email protected]>
Cc Sagi Grimberg <[email protected]>
Cc Stanislaw Gruszka <[email protected]>
Cc Sujith Thomas <[email protected]>
Cc Zhang Rui <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
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(-)
drivers/net/wireless/intel/iwlwifi/dvm/dev.h renamed from drivers/net/wireless/intel/iwlwifi/dvm/dev.h~iwlwifi-use-linux-unitsh-helpers +0 -5
@@ -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
drivers/net/wireless/intel/iwlwifi/dvm/devices.c renamed from drivers/net/wireless/intel/iwlwifi/dvm/devices.c~iwlwifi-use-linux-unitsh-helpers +4 -2
@@ -10,6 +10,8 @@* *****************************************************************************/ +#include <linux/units.h> +/* * DVM device-specific data & functions */
@@ -345,7 +347,7 @@ static s32 iwl_temp_calib_to_offset(strustatic 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 i 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); }
_
Patches currently in -mm which might be from [email protected] are