Skip to contentSkip to conversation

Remove set but unused variables

PATCH In review Fabio M. De Francesco 2 participants 4 messages Apr 30, 2021 Staging

lore
Share & tools
lore
#0 lore raw

v2 cover Remove set but unused variables

Removed set but unused variables. Issue detected by gcc.

Changes from v1: As suggested by Dan Carpenter, removed no more needed curly braces around single statement blocks (patch 2/2).

Fabio M. De Francesco (2):
staging: rtl8723bs: hal: Remove set but unused variables
staging: rtl8723bs: core: Remove set but unused variable

 drivers/staging/rtl8723bs/core/rtw_mlme_ext.c     | 9 +++------
 drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 5 -----
 2 files changed, 3 insertions(+), 11 deletions(-)
Signature · 1 line
2.31.1
#1 lore raw

PATCH v2 1/2 staging: rtl8723bs: hal: Remove set but unused variables

Removed four set but unused variables. Issue detected by gcc.

---

Changes from v1: No changes.

 drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 5 -----
 1 file changed, 5 deletions(-)
drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c +0 -5
index 082448557b53..96cb4426a0f4 100644
@@ -3900,14 +3900,11 @@ u8 GetHalDefVar8723B(struct adapter *padapter, enum hal_def_variable variable, v
 			u32 cmd;
 			u32 ra_info1, ra_info2;
 			u32 rate_mask1, rate_mask2;
-			u8 curr_tx_rate, curr_tx_sgi, hight_rate, lowest_rate;
 
 			cmd = 0x40000100 | mac_id;
 			rtw_write32(padapter, REG_HMEBOX_DBG_2_8723B, cmd);
 			msleep(10);
 			ra_info1 = rtw_read32(padapter, 0x2F0);
-			curr_tx_rate = ra_info1&0x7F;
-			curr_tx_sgi = (ra_info1>>7)&0x01;
 
 			cmd = 0x40000400 | mac_id;
 			rtw_write32(padapter, REG_HMEBOX_DBG_2_8723B, cmd);
@@ -3916,8 +3913,6 @@ u8 GetHalDefVar8723B(struct adapter *padapter, enum hal_def_variable variable, v
 			ra_info2 = rtw_read32(padapter, 0x2F4);
 			rate_mask1 = rtw_read32(padapter, 0x2F8);
 			rate_mask2 = rtw_read32(padapter, 0x2FC);
-			hight_rate = ra_info2&0xFF;
-			lowest_rate = (ra_info2>>8)  & 0xFF;
 
 		}
 		break;
Signature · 1 line
2.31.1
#2 lore raw

PATCH v2 2/2 staging: rtl8723bs: core: Remove set but unused variable

In reply to Fabio M. De Francesco

Removed set but unused variable. Issue detected by gcc.

---

Changes from v1: As suggested by Dan Carpenter, removed no more needed curly braces around single statement blocks.

 drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +3 -6
index a2fdd5ea5fc4..4df03f0a1242 100644
@@ -1019,7 +1019,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)
 	u16 capab_info;
 	struct rtw_ieee802_11_elems elems;
 	struct sta_info *pstat;
-	unsigned char 	reassoc, *p, *pos, *wpa_ie;
+	unsigned char 	*p, *pos, *wpa_ie;
 	unsigned char WMM_IE[] = {0x00, 0x50, 0xf2, 0x02, 0x00, 0x01};
 	int		i, ie_len, wpa_ie_len, left;
 	unsigned char 	supportRate[16];
@@ -1039,13 +1039,10 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)
 		return _FAIL;
 
 	frame_type = GetFrameSubType(pframe);
-	if (frame_type == WIFI_ASSOCREQ) {
-		reassoc = 0;
+	if (frame_type == WIFI_ASSOCREQ) 
 		ie_offset = _ASOCREQ_IE_OFFSET_;
-	} else { /*  WIFI_REASSOCREQ */
-		reassoc = 1;
+	else /*  WIFI_REASSOCREQ */
 		ie_offset = _REASOCREQ_IE_OFFSET_;
-	}
 
 
 	if (pkt_len < sizeof(struct ieee80211_hdr_3addr) + ie_offset)
Signature · 1 line
2.31.1