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

Commit 0453674c authored by Johannes Berg's avatar Johannes Berg Committed by Wey-Yi Guy
Browse files

iwlwifi: remove set_ct_kill operation 



This operation is only ever called from set_hw_params,
which is also already based on the config/ops, so that
there's no need to have a separate set_ct_kill op and
we can just call the right ct_threshold function.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent 84fac3d9

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

+1 −3
Original line number Diff line number Diff line
@@ -151,8 +151,7 @@ static int iwl1000_hw_set_hw_params(struct iwl_priv *priv) 
	priv->hw_params.valid_tx_ant = priv->cfg->valid_tx_ant;

	priv->hw_params.valid_rx_ant = priv->cfg->valid_rx_ant;



	if (priv->cfg->ops->lib->temp_ops.set_ct_kill)

		priv->cfg->ops->lib->temp_ops.set_ct_kill(priv);

	iwl1000_set_ct_threshold(priv);



	/* Set initial sensitivity parameters */

	/* Set initial calibration set */
@@ -219,7 +218,6 @@ static struct iwl_lib_ops iwl1000_lib = { 
	.config_ap = iwl_config_ap,

	.temp_ops = {

		.temperature = iwlagn_temperature,

		.set_ct_kill = iwl1000_set_ct_threshold,

	 },

	.manage_ibss_station = iwlagn_manage_ibss_station,

	.update_bcast_stations = iwl_update_bcast_stations,

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

+2 −3
Original line number Diff line number Diff line
@@ -669,8 +669,8 @@ static int iwl4965_hw_set_hw_params(struct iwl_priv *priv) 
	priv->hw_params.rx_chains_num = num_of_ant(priv->cfg->valid_rx_ant);

	priv->hw_params.valid_tx_ant = priv->cfg->valid_tx_ant;

	priv->hw_params.valid_rx_ant = priv->cfg->valid_rx_ant;

	if (priv->cfg->ops->lib->temp_ops.set_ct_kill)

		priv->cfg->ops->lib->temp_ops.set_ct_kill(priv);



	iwl4965_set_ct_threshold(priv);



	priv->hw_params.sens = &iwl4965_sensitivity;

	priv->hw_params.beacon_time_tsf_bits = IWLAGN_EXT_BEACON_TIME_POS;
@@ -2292,7 +2292,6 @@ static struct iwl_lib_ops iwl4965_lib = { 
	.isr = iwl_isr_legacy,

	.temp_ops = {

		.temperature = iwl4965_temperature_calib,

		.set_ct_kill = iwl4965_set_ct_threshold,

	},

	.manage_ibss_station = iwlagn_manage_ibss_station,

	.update_bcast_stations = iwl_update_bcast_stations,

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

+2 −6
Original line number Diff line number Diff line
@@ -195,8 +195,7 @@ static int iwl5000_hw_set_hw_params(struct iwl_priv *priv) 
	priv->hw_params.valid_tx_ant = priv->cfg->valid_tx_ant;

	priv->hw_params.valid_rx_ant = priv->cfg->valid_rx_ant;



	if (priv->cfg->ops->lib->temp_ops.set_ct_kill)

		priv->cfg->ops->lib->temp_ops.set_ct_kill(priv);

	iwl5000_set_ct_threshold(priv);



	/* Set initial sensitivity parameters */

	/* Set initial calibration set */
@@ -242,8 +241,7 @@ static int iwl5150_hw_set_hw_params(struct iwl_priv *priv) 
	priv->hw_params.valid_tx_ant = priv->cfg->valid_tx_ant;

	priv->hw_params.valid_rx_ant = priv->cfg->valid_rx_ant;



	if (priv->cfg->ops->lib->temp_ops.set_ct_kill)

		priv->cfg->ops->lib->temp_ops.set_ct_kill(priv);

	iwl5150_set_ct_threshold(priv);



	/* Set initial sensitivity parameters */

	/* Set initial calibration set */
@@ -394,7 +392,6 @@ static struct iwl_lib_ops iwl5000_lib = { 
	.config_ap = iwl_config_ap,

	.temp_ops = {

		.temperature = iwlagn_temperature,

		.set_ct_kill = iwl5000_set_ct_threshold,

	 },

	.manage_ibss_station = iwlagn_manage_ibss_station,

	.update_bcast_stations = iwl_update_bcast_stations,
@@ -465,7 +462,6 @@ static struct iwl_lib_ops iwl5150_lib = { 
	.config_ap = iwl_config_ap,

	.temp_ops = {

		.temperature = iwl5150_temperature,

		.set_ct_kill = iwl5150_set_ct_threshold,

	 },

	.manage_ibss_station = iwlagn_manage_ibss_station,

	.update_bcast_stations = iwl_update_bcast_stations,

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

+1 −4
Original line number Diff line number Diff line
@@ -192,8 +192,7 @@ static int iwl6000_hw_set_hw_params(struct iwl_priv *priv) 
	priv->hw_params.valid_tx_ant = priv->cfg->valid_tx_ant;

	priv->hw_params.valid_rx_ant = priv->cfg->valid_rx_ant;



	if (priv->cfg->ops->lib->temp_ops.set_ct_kill)

		priv->cfg->ops->lib->temp_ops.set_ct_kill(priv);

	iwl6000_set_ct_threshold(priv);



	/* Set initial sensitivity parameters */

	/* Set initial calibration set */
@@ -334,7 +333,6 @@ static struct iwl_lib_ops iwl6000_lib = { 
	.config_ap = iwl_config_ap,

	.temp_ops = {

		.temperature = iwlagn_temperature,

		.set_ct_kill = iwl6000_set_ct_threshold,

	 },

	.manage_ibss_station = iwlagn_manage_ibss_station,

	.update_bcast_stations = iwl_update_bcast_stations,
@@ -408,7 +406,6 @@ static struct iwl_lib_ops iwl6000g2b_lib = { 
	.config_ap = iwl_config_ap,

	.temp_ops = {

		.temperature = iwlagn_temperature,

		.set_ct_kill = iwl6000_set_ct_threshold,

	 },

	.manage_ibss_station = iwlagn_manage_ibss_station,

	.update_bcast_stations = iwl_update_bcast_stations,

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

+0 −1
Original line number Diff line number Diff line
@@ -137,7 +137,6 @@ struct iwl_debugfs_ops { 


struct iwl_temp_ops {

	void (*temperature)(struct iwl_priv *priv);

	void (*set_ct_kill)(struct iwl_priv *priv);

};



struct iwl_tt_ops {