Skip to contentSkip to conversation

staging: r8188eu: cleaning up unused variable

PATCH Superseded Kang Minchul 3 participants 7 messages Oct 23, 2022 – Oct 24, 2022 Staging

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Kang Minchul

author
#0 lore raw

cover staging: r8188eu: cleaning up unused variable

This patch series cleans up unused variables in r8188eu causing coccicheck warnings.

Kang Minchul (4):
staging: r8188eu: remove unnecessary variable in ioctl_linux
staging: r8188eu: remove unnecessary variable in rtw_recv
staging: r8188eu: remove unnecessary variable in rtl8188eu_xmit
staging: r8188eu: remove unnecessary variable in rtw_ap

 drivers/staging/r8188eu/core/rtw_ap.c        | 5 ++---
 drivers/staging/r8188eu/core/rtw_recv.c      | 3 +--
 drivers/staging/r8188eu/hal/rtl8188eu_xmit.c | 3 +--
 drivers/staging/r8188eu/os_dep/ioctl_linux.c | 4 +---
 4 files changed, 5 insertions(+), 10 deletions(-)
Signature · 1 line
2.34.1
author
#1 lore raw

PATCH 1/4 staging: r8188eu: remove unnecessary variable in ioctl_linux

Returning value 0 directly instead of storing it in variable ret. This commit can prevent cocci warning as follows:

Unneeded variable: "ret". Return "0" on line 3030

Signed-off-by Kang Minchul <[email protected]>
---
 drivers/staging/r8188eu/os_dep/ioctl_linux.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/staging/r8188eu/os_dep/ioctl_linux.c +1 -3
index 2de2e1e32738..5e1ad7733127 100644
@@ -2979,8 +2979,6 @@ static int rtw_p2p_set(struct net_device *dev,
 			       struct iw_request_info *info,
 			       union iwreq_data *wrqu, char *extra)
 {
-	int ret = 0;
-
 	if (!memcmp(extra, "enable =", 7)) {
 		rtw_wext_p2p_enable(dev, info, wrqu, &extra[7]);
 	} else if (!memcmp(extra, "setDN =", 6)) {

@@ -3027,7 +3025,7 @@ static int rtw_p2p_set(struct net_device *dev,
 		rtw_p2p_set_persistent(dev, info, wrqu, &extra[11]);
 	}
 
-	return ret;
+	return 0;
 }
 
 static int rtw_p2p_get2(struct net_device *dev,
Signature · 1 line
2.34.1
author
#2 lore raw

PATCH 2/4 staging: r8188eu: remove unnecessary variable in rtw_recv

In reply to Kang Minchul

Return _SUCCESS directly instead of storing it in a variable. This can prevent cocci warning as follows:

Unneeded variable: "ret". Return "_SUCCESS" on line 1516

Signed-off-by Kang Minchul <[email protected]>
---
 drivers/staging/r8188eu/core/rtw_recv.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/staging/r8188eu/core/rtw_recv.c +1 -2
index bb5c3b3888e0..9e98aea09583 100644
@@ -1415,7 +1415,6 @@ static int amsdu_to_msdu(struct adapter *padapter, struct recv_frame *prframe)
 
 	struct recv_priv *precvpriv = &padapter->recvpriv;
 	struct __queue *pfree_recv_queue = &precvpriv->free_recv_queue;
-	int	ret = _SUCCESS;
 
 	nr_subframes = 0;
 

@@ -1513,7 +1512,7 @@ static int amsdu_to_msdu(struct adapter *padapter, struct recv_frame *prframe)
 	prframe->len = 0;
 	rtw_free_recvframe(prframe, pfree_recv_queue);/* free this recv_frame */
 
-	return ret;
+	return _SUCCESS;
 }
 
 static bool check_indicate_seq(struct recv_reorder_ctrl *preorder_ctrl, u16 seq_num)
Signature · 1 line
2.34.1
#3 lore raw

Re: [PATCH 2/4] staging: r8188eu: remove unnecessary variable in rtw_recv

Quoted 6 lines · Kang Minchul

Return _SUCCESS directly instead of storing it in a variable. This can prevent cocci warning as follows:

Unneeded variable: "ret". Return "_SUCCESS" on line 1516

Signed-off-by Kang Minchul <[email protected]>

Make the function void instead.

regards,
dan carpenter

author
#4 lore raw

PATCH 3/4 staging: r8188eu: remove unnecessary variable in rtl8188eu_xmit

In reply to Kang Minchul

Return 0 directly instead of storing it in a variable. This can prevent cocci warning as follows:

Unneeded variable: "pull". Return "0" on line 298

Signed-off-by Kang Minchul <[email protected]>
---
 drivers/staging/r8188eu/hal/rtl8188eu_xmit.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/staging/r8188eu/hal/rtl8188eu_xmit.c +1 -2
index 8e4a5acc0b18..6d1f56d1f9d7 100644
@@ -149,7 +149,6 @@ static void fill_txdesc_phy(struct pkt_attrib *pattrib, __le32 *pdw)
 
 static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz, u8 bagg_pkt)
 {
-	int	pull = 0;
 	uint	qsel;
 	u8 data_rate, pwr_status, offset;
 	struct adapter		*adapt = pxmitframe->padapter;

@@ -295,7 +294,7 @@ static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz, u8 bag
 	ODM_SetTxAntByTxInfo_88E(&haldata->odmpriv, pmem, pattrib->mac_id);
 
 	rtl8188eu_cal_txdesc_chksum(ptxdesc);
-	return pull;
+	return 0;
 }
 
 /* for non-agg data frame or  management frame */
Signature · 1 line
2.34.1
author
#5 lore raw

PATCH 4/4 staging: r8188eu: remove unnecessary variable in rtw_ap

In reply to Kang Minchul

Return 0 directly instead of storing it in a variable. This can prevent cocci warning as follows:

Unneeded variable: "ret". Return "0" on line 1031

Signed-off-by Kang Minchul <[email protected]>
---
 drivers/staging/r8188eu/core/rtw_ap.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/staging/r8188eu/core/rtw_ap.c +2 -3
index 24eb8dce9bfe..9eaf345e6a00 100644
@@ -1020,7 +1020,6 @@ u8 ap_free_sta(struct adapter *padapter, struct sta_info *psta,
 int rtw_sta_flush(struct adapter *padapter)
 {
 	struct list_head *phead, *plist;
-	int ret = 0;
 	struct sta_info *psta = NULL;
 	struct sta_priv *pstapriv = &padapter->stapriv;
 	struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;

@@ -1028,7 +1027,7 @@ int rtw_sta_flush(struct adapter *padapter)
 	u8 bc_addr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
 
 	if ((pmlmeinfo->state & 0x03) != WIFI_FW_AP_STATE)
-		return ret;
+		return 0;
 
 	spin_lock_bh(&pstapriv->asoc_list_lock);
 	phead = &pstapriv->asoc_list;

@@ -1051,7 +1050,7 @@ int rtw_sta_flush(struct adapter *padapter)
 
 	associated_clients_update(padapter, true);
 
-	return ret;
+	return 0;
 }
 
 /* called > TSR LEVEL for USB or SDIO Interface*/
Signature · 1 line
2.34.1
Tested-by on the v1 series
#6 lore raw
In reply to Kang Minchul
Quoted 9 lines · Kang Minchul

This patch series cleans up unused variables in r8188eu causing coccicheck warnings.

Kang Minchul (4):
staging: r8188eu: remove unnecessary variable in ioctl_linux
staging: r8188eu: remove unnecessary variable in rtw_recv
staging: r8188eu: remove unnecessary variable in rtl8188eu_xmit
staging: r8188eu: remove unnecessary variable in rtw_ap

Quoted 6 lines
  drivers/staging/r8188eu/core/rtw_ap.c        | 5 ++---
  drivers/staging/r8188eu/core/rtw_recv.c      | 3 +--
  drivers/staging/r8188eu/hal/rtl8188eu_xmit.c | 3 +--
  drivers/staging/r8188eu/os_dep/ioctl_linux.c | 4 +---
  4 files changed, 5 insertions(+), 10 deletions(-)
Tested-by Philipp Hortmann <[email protected]> # Edimax N150