Skip to contentSkip to conversation

iwlwifi: mvm: rs: Remove unused 'mvmvif'/'mvmsta' variables

PATCH In review Kirtika Ruchandani 2 participants 2 messages Nov 9, 2016 Intel wireless wifi link (iwlwifi)

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/3 iwlwifi: mvm: rs: Remove unused 'mvmvif'/'mvmsta' variables

mvmvif is defined and set in rs_mimo_allow but not used. Compiling iwlwifi with W=1 gives the following warning, remove it. mvmsta is used only to obtain mvmvif so remove it as well.

iwlwifi/mvm/rs.c: In function 'rs_mimo_allow':
iwlwifi/mvm/rs.c:165:22: warning: variable 'mvmvif' set but not used.[-Wunused-but-set-variable]

This fix removes calls to iwl_mvm_sta_from_mac & iwl_mvm_vif_from_mac. They are both accessors, and do not have any side-effects.
Commit e621c2282 removed a workaround that disabled MIMO on P2P, 'mvmvif' was used for that workaround, but not removed with it.

Fixes e621c2282e31 ("iwlwifi: rs: Remove workaround that disables MIMO on P2P")
Cc Alexander Bondar <[email protected]>
Cc Emmanuel Grumbach <[email protected]>
---
 drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 6 ------
 1 file changed, 6 deletions(-)
drivers/net/wireless/intel/iwlwifi/mvm/rs.c +0 -6
index 227c5ed..0b79f4a 100644
@@ -161,9 +161,6 @@ static bool rs_mimo_allow(struct iwl_mvm *mvm, struct ieee80211_sta *sta,
 			  struct rs_rate *rate,
 			  const struct rs_tx_column *next_col)
 {
-	struct iwl_mvm_sta *mvmsta;
-	struct iwl_mvm_vif *mvmvif;
-
 	if (!sta->ht_cap.ht_supported)
 		return false;
 
@@ -176,9 +173,6 @@ static bool rs_mimo_allow(struct iwl_mvm *mvm, struct ieee80211_sta *sta,
 	if (!iwl_mvm_bt_coex_is_mimo_allowed(mvm, sta))
 		return false;
 
-	mvmsta = iwl_mvm_sta_from_mac80211(sta);
-	mvmvif = iwl_mvm_vif_from_mac80211(mvmsta->vif);
-
 	if (mvm->nvm_data->sku_cap_mimo_disabled)
 		return false;
 
Signature · 1 line
2.8.0.rc3.226.g39d4020
#1 lore raw

(removed Erarn Harary from the Cc list, since this email is not valid anymore)

Hi Kirtika,
Just a couple of nitpicks, nothing important, so no need to resend.

Quoted 7 lines · Kirtika Ruchandani

mvmvif is defined and set in rs_mimo_allow but not used. Compiling iwlwifi with W=1 gives the following warning, remove it. mvmsta is used only to obtain mvmvif so remove it as well.

iwlwifi/mvm/rs.c: In function 'rs_mimo_allow':
iwlwifi/mvm/rs.c:165:22: warning: variable 'mvmvif' set but not used.[-Wunused-but-set-variable]

Quoted 7 lines

This fix removes calls to iwl_mvm_sta_from_mac & iwl_mvm_vif_from_mac. They are both accessors, and do not have any side-effects.
Commit e621c2282 removed a workaround that disabled MIMO on P2P, 'mvmvif' was used for that workaround, but not removed with it.

Fixes e621c2282e31 ("iwlwifi: rs: Remove workaround that disables MIMO on P2P")

Usually the Fixes: tag is together with the other tags (such as Cc, Signed-off-by), i.e. no empty line here.

Quoted 3 lines
Cc Alexander Bondar <[email protected]>
Cc Emmanuel Grumbach <[email protected]>

And the Signed-off-by tag is usually the last one here, after all Cc's and stuff. But it doesn't matter much.

--
Cheers,
Luca.