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

Commit 70817b5e authored by Johannes Berg's avatar Johannes Berg Committed by Wey-Yi Guy
Browse files

iwlagn: remove set but unused vars 



gcc is warning that a few variables in rate
scaling are set but never otherwise used.
This pointed out a few simplifications.

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

drivers/net/wireless/iwlwifi/iwl-agn-rs.c

+10 −18
Original line number Diff line number Diff line
@@ -2199,7 +2199,7 @@ static void rs_stay_in_table(struct iwl_lq_sta *lq_sta, bool force_search) 
 * setup rate table in uCode

 * return rate_n_flags as used in the table

 */

static u32 rs_update_rate_tbl(struct iwl_priv *priv,

static void rs_update_rate_tbl(struct iwl_priv *priv,

			       struct iwl_rxon_context *ctx,

			       struct iwl_lq_sta *lq_sta,

			       struct iwl_scale_tbl_info *tbl,
@@ -2211,8 +2211,6 @@ static u32 rs_update_rate_tbl(struct iwl_priv *priv, 
	rate = rate_n_flags_from_tbl(priv, tbl, index, is_green);

	rs_fill_link_cmd(priv, lq_sta, rate);

	iwl_send_lq_cmd(priv, ctx, &lq_sta->lq, CMD_ASYNC, false);



	return rate;

}



/*
@@ -2241,7 +2239,6 @@ static void rs_rate_scale_perform(struct iwl_priv *priv, 
	u8 update_lq = 0;

	struct iwl_scale_tbl_info *tbl, *tbl1;

	u16 rate_scale_index_msk = 0;

	u32 rate;

	u8 is_green = 0;

	u8 active_tbl = 0;

	u8 done_search = 0;
@@ -2328,8 +2325,8 @@ static void rs_rate_scale_perform(struct iwl_priv *priv, 
			tbl = &(lq_sta->lq_info[lq_sta->active_tbl]);

			/* get "active" rate info */

			index = iwl_hwrate_to_plcp_idx(tbl->current_rate);

			rate = rs_update_rate_tbl(priv, ctx, lq_sta,

						  tbl, index, is_green);

			rs_update_rate_tbl(priv, ctx, lq_sta, tbl,

					   index, is_green);

		}

		return;

	}
@@ -2570,8 +2567,7 @@ static void rs_rate_scale_perform(struct iwl_priv *priv, 
lq_update:

	/* Replace uCode's rate table for the destination station. */

	if (update_lq)

		rate = rs_update_rate_tbl(priv, ctx, lq_sta,

					  tbl, index, is_green);

		rs_update_rate_tbl(priv, ctx, lq_sta, tbl, index, is_green);



	if (iwl_tx_ant_restriction(priv) == IWL_ANT_OK_MULTI) {

		/* Should we stay with this modulation mode,
@@ -3270,14 +3266,10 @@ static const struct file_operations rs_sta_dbgfs_stats_table_ops = { 
static ssize_t rs_sta_dbgfs_rate_scale_data_read(struct file *file,

			char __user *user_buf, size_t count, loff_t *ppos)

{

	char buff[120];

	int desc = 0;



	struct iwl_lq_sta *lq_sta = file->private_data;

	struct iwl_priv *priv;

	struct iwl_scale_tbl_info *tbl = &lq_sta->lq_info[lq_sta->active_tbl];



	priv = lq_sta->drv;

	char buff[120];

	int desc = 0;



	if (is_Ht(tbl->lq_type))

		desc += sprintf(buff+desc,

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

+3 −4
Original line number Diff line number Diff line
@@ -216,9 +216,8 @@ static int iwl_eeprom_verify_signature(struct iwl_priv *priv) 


static void iwl_set_otp_access(struct iwl_priv *priv, enum iwl_access_mode mode)

{

	u32 otpgp;

	iwl_read32(priv, CSR_OTP_GP_REG);



	otpgp = iwl_read32(priv, CSR_OTP_GP_REG);

	if (mode == IWL_OTP_ACCESS_ABSOLUTE)

		iwl_clear_bit(priv, CSR_OTP_GP_REG,

			      CSR_OTP_GP_REG_OTP_ACCESS_MODE);