Commit e327cf83 authored by Haowen Bai's avatar Haowen Bai Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: Directly return _SUCCESS instead of using local ret variable 



As init_mlme_ext_priv function always returns SUCCESS , We can change
return type from int to void.

fixes coccinelle warning:
./drivers/staging/r8188eu/core/rtw_mlme_ext.c:357:5-8: Unneeded variable: "res".
 Return "_SUCCESS" on line 380

Reviewed-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarHaowen Bai <baihaowen@meizu.com>
Link: https://lore.kernel.org/r/1648603740-14760-1-git-send-email-baihaowen@meizu.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 18ce31aa

drivers/staging/r8188eu/core/rtw_mlme_ext.c

+1 −4
Original line number Original line Diff line number Diff line
@@ -351,9 +351,8 @@ static u8 init_channel_set(struct adapter *padapter, u8 ChannelPlan, struct rt_c 
	return chanset_size;

	return chanset_size;

}

}





int	init_mlme_ext_priv(struct adapter *padapter)

void init_mlme_ext_priv(struct adapter *padapter)

{

{

	int	res = _SUCCESS;

	struct registry_priv *pregistrypriv = &padapter->registrypriv;

	struct registry_priv *pregistrypriv = &padapter->registrypriv;

	struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;

	struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;

	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;

	struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
@@ -375,8 +374,6 @@ int init_mlme_ext_priv(struct adapter *padapter) 
	pmlmeext->mlmeext_init = true;

	pmlmeext->mlmeext_init = true;





	pmlmeext->active_keep_alive_check = true;

	pmlmeext->active_keep_alive_check = true;



	return res;

}

}





void free_mlme_ext_priv(struct mlme_ext_priv *pmlmeext)

void free_mlme_ext_priv(struct mlme_ext_priv *pmlmeext)

drivers/staging/r8188eu/include/rtw_mlme_ext.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -395,7 +395,7 @@ struct mlme_ext_priv { 
	u8 active_keep_alive_check;

	u8 active_keep_alive_check;

};

};





int init_mlme_ext_priv(struct adapter *adapter);

void init_mlme_ext_priv(struct adapter *adapter);

int init_hw_mlme_ext(struct adapter *padapter);

int init_hw_mlme_ext(struct adapter *padapter);

void free_mlme_ext_priv (struct mlme_ext_priv *pmlmeext);

void free_mlme_ext_priv (struct mlme_ext_priv *pmlmeext);

extern void init_mlme_ext_timer(struct adapter *padapter);

extern void init_mlme_ext_timer(struct adapter *padapter);

drivers/staging/r8188eu/os_dep/os_intfs.c

+1 −5
Original line number Original line Diff line number Diff line
@@ -490,10 +490,7 @@ u8 rtw_init_drv_sw(struct adapter *padapter) 
	init_wifidirect_info(padapter, P2P_ROLE_DISABLE);

	init_wifidirect_info(padapter, P2P_ROLE_DISABLE);

	reset_global_wifidirect_info(padapter);

	reset_global_wifidirect_info(padapter);





	if (init_mlme_ext_priv(padapter) == _FAIL) {

	init_mlme_ext_priv(padapter);

		dev_err(dvobj_to_dev(padapter->dvobj), "init_mlme_ext_priv failed\n");

		goto free_mlme_priv;

	}





	if (_rtw_init_xmit_priv(&padapter->xmitpriv, padapter) == _FAIL) {

	if (_rtw_init_xmit_priv(&padapter->xmitpriv, padapter) == _FAIL) {

		dev_err(dvobj_to_dev(padapter->dvobj), "_rtw_init_xmit_priv failed\n");

		dev_err(dvobj_to_dev(padapter->dvobj), "_rtw_init_xmit_priv failed\n");
@@ -534,7 +531,6 @@ u8 rtw_init_drv_sw(struct adapter *padapter) 
free_mlme_ext:

free_mlme_ext:

	free_mlme_ext_priv(&padapter->mlmeextpriv);

	free_mlme_ext_priv(&padapter->mlmeextpriv);





free_mlme_priv:

	rtw_free_mlme_priv(&padapter->mlmepriv);

	rtw_free_mlme_priv(&padapter->mlmepriv);





free_evt_priv:

free_evt_priv: