iwlwifi: mvm: rs: Remove unused 'mvmvif'/'mvmsta' variables
authorKirtika Ruchandani <kirtika.ruchandani@gmail.com>
Wed, 9 Nov 2016 05:50:15 +0000 (21:50 -0800)
committerLuca Coelho <luciano.coelho@intel.com>
Thu, 26 Jan 2017 07:38:59 +0000 (09:38 +0200)
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 e621c2282e31 ("iwlwifi: rs: Remove workaround
that disables MIMO on P2P") 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")
Signed-off-by: Kirtika Ruchandani <kirtika@google.com>
Cc: Alexander Bondar <alexander.bondar@intel.com>
Cc: Emmanuel Grumbach <emmmanuel.grumbach@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
drivers/net/wireless/intel/iwlwifi/mvm/rs.c

index 227c5ed9cbe6366611682c717d81336df83318d3..0b79f4a43eaf59695c3e5cc829b9506c14960545 100644 (file)
@@ -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;