Commit dedc1a73 authored by Harsha Sharma's avatar Harsha Sharma Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723bs: Merge assignment with return 



Merge assignment with return statement to directly return the value.
Done using following coccinelle semantic patch

@@
local idexpression ret;
expression e;
@@

-ret =
+return
     e;
-return ret;

Signed-off-by: default avatarHarsha Sharma <harshasharmaiitr@gmail.com>
Acked-by: default avatarJulia Lawall <julia.lawall@lip6.fr>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent af9cdf95

drivers/staging/rtl8723bs/os_dep/ioctl_linux.c

+4 −16
Original line number Diff line number Diff line
@@ -2123,12 +2123,9 @@ static int rtw_wx_set_gen_ie(struct net_device *dev, 
			     struct iw_request_info *info,

			     union iwreq_data *wrqu, char *extra)

{

	int ret;

	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);



	ret = rtw_set_wpa_ie(padapter, extra, wrqu->data.length);



	return ret;

	return rtw_set_wpa_ie(padapter, extra, wrqu->data.length);

}



static int rtw_wx_set_auth(struct net_device *dev,
@@ -3857,7 +3854,6 @@ static int rtw_hostapd_sta_flush(struct net_device *dev) 
{

	/* _irqL irqL; */

	/* struct list_head	*phead, *plist; */

	int ret = 0;

	/* struct sta_info *psta = NULL; */

	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);

	/* struct sta_priv *pstapriv = &padapter->stapriv; */
@@ -3866,9 +3862,7 @@ static int rtw_hostapd_sta_flush(struct net_device *dev) 


	flush_all_cam_entry(padapter);	/* clear CAM */



	ret = rtw_sta_flush(padapter);



	return ret;

	return rtw_sta_flush(padapter);



}
@@ -4266,7 +4260,6 @@ static int rtw_set_hidden_ssid(struct net_device *dev, struct ieee_param *param, 


static int rtw_ioctl_acl_remove_sta(struct net_device *dev, struct ieee_param *param, int len)

{

	int ret = 0;

	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);

	struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
@@ -4279,15 +4272,12 @@ static int rtw_ioctl_acl_remove_sta(struct net_device *dev, struct ieee_param *p 
		return -EINVAL;

	}



	ret = rtw_acl_remove_sta(padapter, param->sta_addr);



	return ret;

	return rtw_acl_remove_sta(padapter, param->sta_addr);



}



static int rtw_ioctl_acl_add_sta(struct net_device *dev, struct ieee_param *param, int len)

{

	int ret = 0;

	struct adapter *padapter = (struct adapter *)rtw_netdev_priv(dev);

	struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
@@ -4300,9 +4290,7 @@ static int rtw_ioctl_acl_add_sta(struct net_device *dev, struct ieee_param *para 
		return -EINVAL;

	}



	ret = rtw_acl_add_sta(padapter, param->sta_addr);



	return ret;

	return rtw_acl_add_sta(padapter, param->sta_addr);



}