Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9563fe16 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

iwlwifi: remove unused max_nrg_cck from sensitivity and constify 



The sensitivity parameters are never modified, so they
should be const. Also remove the unused max_nrg_cck
value to save some space.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 51dc51d1

drivers/net/wireless/iwlwifi/iwl-1000.c

+1 −2
Original line number Diff line number Diff line
@@ -96,9 +96,8 @@ static void iwl1000_nic_config(struct iwl_priv *priv) 
				~APMG_SVR_VOLTAGE_CONFIG_BIT_MSK);

}



static struct iwl_sensitivity_ranges iwl1000_sensitivity = {

static const struct iwl_sensitivity_ranges iwl1000_sensitivity = {

	.min_nrg_cck = 95,

	.max_nrg_cck = 0, /* not used, set to 0 */

	.auto_corr_min_ofdm = 90,

	.auto_corr_min_ofdm_mrc = 170,

	.auto_corr_min_ofdm_x1 = 120,

drivers/net/wireless/iwlwifi/iwl-2000.c

+1 −2
Original line number Diff line number Diff line
@@ -91,9 +91,8 @@ static void iwl2000_nic_config(struct iwl_priv *priv) 
			    CSR_GP_DRIVER_REG_BIT_RADIO_IQ_INVER);

}



static struct iwl_sensitivity_ranges iwl2000_sensitivity = {

static const struct iwl_sensitivity_ranges iwl2000_sensitivity = {

	.min_nrg_cck = 97,

	.max_nrg_cck = 0, /* not used, set to 0 */

	.auto_corr_min_ofdm = 80,

	.auto_corr_min_ofdm_mrc = 128,

	.auto_corr_min_ofdm_x1 = 105,

drivers/net/wireless/iwlwifi/iwl-5000.c

+1 −3
Original line number Diff line number Diff line
@@ -75,9 +75,8 @@ static void iwl5000_nic_config(struct iwl_priv *priv) 
				~APMG_PS_CTRL_EARLY_PWR_OFF_RESET_DIS);

}



static struct iwl_sensitivity_ranges iwl5000_sensitivity = {

static const struct iwl_sensitivity_ranges iwl5000_sensitivity = {

	.min_nrg_cck = 100,

	.max_nrg_cck = 0, /* not used, set to 0 */

	.auto_corr_min_ofdm = 90,

	.auto_corr_min_ofdm_mrc = 170,

	.auto_corr_min_ofdm_x1 = 105,
@@ -102,7 +101,6 @@ static struct iwl_sensitivity_ranges iwl5000_sensitivity = { 


static struct iwl_sensitivity_ranges iwl5150_sensitivity = {

	.min_nrg_cck = 95,

	.max_nrg_cck = 0, /* not used, set to 0 */

	.auto_corr_min_ofdm = 90,

	.auto_corr_min_ofdm_mrc = 170,

	.auto_corr_min_ofdm_x1 = 105,

drivers/net/wireless/iwlwifi/iwl-6000.c

+1 −2
Original line number Diff line number Diff line
@@ -113,9 +113,8 @@ static void iwl6000_nic_config(struct iwl_priv *priv) 
		cfg(priv)->additional_nic_config(priv);

}



static struct iwl_sensitivity_ranges iwl6000_sensitivity = {

static const struct iwl_sensitivity_ranges iwl6000_sensitivity = {

	.min_nrg_cck = 110,

	.max_nrg_cck = 0, /* not used, set to 0 */

	.auto_corr_min_ofdm = 80,

	.auto_corr_min_ofdm_mrc = 128,

	.auto_corr_min_ofdm_x1 = 105,

drivers/net/wireless/iwlwifi/iwl-dev.h

+0 −1
Original line number Diff line number Diff line
@@ -294,7 +294,6 @@ struct iwl_vif_priv { 


struct iwl_sensitivity_ranges {

	u16 min_nrg_cck;

	u16 max_nrg_cck;



	u16 nrg_th_cck;

	u16 nrg_th_ofdm;