staging: rtl8723bs: core: rtw_mlme: Remove a bunch of unused variables

Fixes the following W=1 kernel build warning(s):

 drivers/staging/rtl8723bs/core/rtw_mlme.c: In function ‘rtw_build_wmm_ie_ht’:
 drivers/staging/rtl8723bs/core/rtw_mlme.c:2482:6: warning: variable ‘pframe’ set but not used [-Wunused-but-set-variable]
 drivers/staging/rtl8723bs/core/rtw_mlme.c: In function ‘rtw_restructure_ht_ie’:
 drivers/staging/rtl8723bs/core/rtw_mlme.c:2498:21: warning: variable ‘pframe’ set but not used [-Wunused-but-set-variable]
 drivers/staging/rtl8723bs/core/rtw_mlme.c: In function ‘rtw_update_ht_cap’:
 drivers/staging/rtl8723bs/core/rtw_mlme.c:2647:33: warning: variable ‘pht_addtinfo’ set but not used [-Wunused-but-set-variable]
 from drivers/staging/rtl8188eu/core/rtw_mlme.c:12:

Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-staging@lists.linux.dev
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Link: https://lore.kernel.org/r/20210414181129.1628598-11-lee.jones@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c
index 4707dba..a16eabd 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c
@@ -2353,12 +2353,11 @@ void rtw_build_wmm_ie_ht(struct adapter *padapter, u8 *out_ie, uint *pout_len)
 {
        unsigned char WMM_IE[] = {0x00, 0x50, 0xf2, 0x02, 0x00, 0x01, 0x00};
        int out_len;
-       u8 *pframe;
 
        if (padapter->mlmepriv.qospriv.qos_option == 0) {
                out_len = *pout_len;
-               pframe = rtw_set_ie(out_ie+out_len, WLAN_EID_VENDOR_SPECIFIC,
-                                                       _WMM_IE_Length_, WMM_IE, pout_len);
+               rtw_set_ie(out_ie+out_len, WLAN_EID_VENDOR_SPECIFIC,
+                          _WMM_IE_Length_, WMM_IE, pout_len);
 
                padapter->mlmepriv.qospriv.qos_option = 1;
        }
@@ -2369,7 +2368,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_
 {
        u32 ielen, out_len;
        enum ieee80211_max_ampdu_length_exp max_rx_ampdu_factor;
-       unsigned char *p, *pframe;
+       unsigned char *p;
        struct ieee80211_ht_cap ht_capie;
        u8 cbw40_enable = 0, stbc_rx_enable = 0, rf_type = 0, operation_bw = 0;
        struct registry_priv *pregistrypriv = &padapter->registrypriv;
@@ -2492,8 +2491,8 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_
        else
                ht_capie.ampdu_params_info |= (IEEE80211_HT_CAP_AMPDU_DENSITY&0x00);
 
-       pframe = rtw_set_ie(out_ie+out_len, WLAN_EID_HT_CAPABILITY,
-                                               sizeof(struct ieee80211_ht_cap), (unsigned char *)&ht_capie, pout_len);
+       rtw_set_ie(out_ie+out_len, WLAN_EID_HT_CAPABILITY,
+                  sizeof(struct ieee80211_ht_cap), (unsigned char *)&ht_capie, pout_len);
 
        phtpriv->ht_option = true;
 
@@ -2501,7 +2500,7 @@ unsigned int rtw_restructure_ht_ie(struct adapter *padapter, u8 *in_ie, u8 *out_
                p = rtw_get_ie(in_ie, WLAN_EID_HT_OPERATION, &ielen, in_len);
                if (p && (ielen == sizeof(struct ieee80211_ht_addt_info))) {
                        out_len = *pout_len;
-                       pframe = rtw_set_ie(out_ie+out_len, WLAN_EID_HT_OPERATION, ielen, p+2, pout_len);
+                       rtw_set_ie(out_ie+out_len, WLAN_EID_HT_OPERATION, ielen, p+2, pout_len);
                }
        }
 
@@ -2516,7 +2515,6 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len, u8 channe
        int len;
        /* struct sta_info *bmc_sta, *psta; */
        struct ieee80211_ht_cap *pht_capie;
-       struct ieee80211_ht_addt_info *pht_addtinfo;
        /* struct recv_reorder_ctrl *preorder_ctrl; */
        struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
        struct ht_priv  *phtpriv = &pmlmepriv->htpriv;
@@ -2553,7 +2551,6 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len, u8 channe
        len = 0;
        p = rtw_get_ie(pie+sizeof(struct ndis_802_11_fix_ie), WLAN_EID_HT_OPERATION, &len, ie_len-sizeof(struct ndis_802_11_fix_ie));
        if (p && len > 0) {
-               pht_addtinfo = (struct ieee80211_ht_addt_info *)(p+2);
                /* todo: */
        }