Skip to contentSkip to conversation

staging: rtl8723bs: core: rtw_mlme_ext: fix warning Unneeded variable: "ret"

PATCH Superseded Hariprasad Kelam 2 participants 2 messages May 19, 2019 – May 20, 2019 Staging

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 staging: rtl8723bs: core: rtw_mlme_ext: fix warning Unneeded variable: "ret"

This patch fixes below warnings reported by coccicheck

drivers/staging/rtl8723bs/core/rtw_mlme_ext.c:1888:14-17: Unneeded
variable: "ret". Return "_FAIL" on line 1920 drivers/staging/rtl8723bs/core/rtw_mlme_ext.c:466:5-8: Unneeded
variable: "res". Return "_SUCCESS" on line 494

---
 drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +2 -4
index d110d45..6a2eb66 100644
@@ -463,7 +463,6 @@ static u8 init_channel_set(struct adapter *padapter, u8 ChannelPlan, RT_CHANNEL_
 
 int	init_mlme_ext_priv(struct adapter *padapter)
 {
-	int	res = _SUCCESS;
 	struct registry_priv *pregistrypriv = &padapter->registrypriv;
 	struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
 	struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
@@ -491,7 +490,7 @@ int	init_mlme_ext_priv(struct adapter *padapter)
 	pmlmeext->fixed_chan = 0xFF;
 #endif
 
-	return res;
+	return _SUCCESS;
 
 }
 
@@ -1885,7 +1884,6 @@ unsigned int OnAtim(struct adapter *padapter, union recv_frame *precv_frame)
 
 unsigned int on_action_spct(struct adapter *padapter, union recv_frame *precv_frame)
 {
-	unsigned int ret = _FAIL;
 	struct sta_info *psta = NULL;
 	struct sta_priv *pstapriv = &padapter->stapriv;
 	u8 *pframe = precv_frame->u.hdr.rx_data;
@@ -1917,7 +1915,7 @@ unsigned int on_action_spct(struct adapter *padapter, union recv_frame *precv_fr
 	}
 
 exit:
-	return ret;
+	return _FAIL;
 }
 
 unsigned int OnAction_back(struct adapter *padapter, union recv_frame *precv_frame)
Signature · 1 line
2.7.4
#1 lore raw
Quoted 25 lines · Hariprasad Kelam

This patch fixes below warnings reported by coccicheck

drivers/staging/rtl8723bs/core/rtw_mlme_ext.c:1888:14-17: Unneeded
variable: "ret". Return "_FAIL" on line 1920 drivers/staging/rtl8723bs/core/rtw_mlme_ext.c:466:5-8: Unneeded
variable: "res". Return "_SUCCESS" on line 494

---
 drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +0 -1
index d110d45..6a2eb66 100644
@@ -463,7 +463,6 @@ static u8 init_channel_set(struct adapter *padapter, u8 ChannelPlan, RT_CHANNEL_
 
 int	init_mlme_ext_priv(struct adapter *padapter)
 {
-	int	res = _SUCCESS;
 	struct registry_priv *pregistrypriv = &padapter->registrypriv;
 	struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
 	struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);

drivers/staging/rtl8723bs/core/rtw_mlme_ext.c int init_mlme_ext_priv(struct adapter *padapter) · line 493

Quoted 5 lines
drivers/staging/rtl8723bs/core/rtw_mlme_ext.c +1 -1
@@ -491,7 +490,7 @@ int	init_mlme_ext_priv(struct adapter *padapter)
 	pmlmeext->fixed_chan = 0xFF;
 #endif
 
-	return res;
+	return _SUCCESS;

If it can never fail, it should not be returning a value :(