Commit cb8de77c authored by Nishka Dasgupta's avatar Nishka Dasgupta Committed by Greg Kroah-Hartman

staging; rtl8723bs: Remove unnecessary function rtw_init_mlme_priv()

Remove function rtw_init_mlme_priv() as all it does is call
_rtw_init_mlme_priv().
Change the name of _rtw_init_mlme_priv() to rtw_init_mlme_priv() and its
return type to int.
Remove references to _rtw_init_mlme_priv() from the corresponding header
file.
Suggestion to delete return variable from rtw_init_mlme_priv() put forward
by Coccinelle using ret.cocci.
Signed-off-by: default avatarNishka Dasgupta <nishka.dasgupta@yahoo.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d4223e06
...@@ -13,13 +13,13 @@ ...@@ -13,13 +13,13 @@
extern u8 rtw_do_join(struct adapter *padapter); extern u8 rtw_do_join(struct adapter *padapter);
sint _rtw_init_mlme_priv(struct adapter *padapter) int rtw_init_mlme_priv(struct adapter *padapter)
{ {
sint i; sint i;
u8 *pbuf; u8 *pbuf;
struct wlan_network *pnetwork; struct wlan_network *pnetwork;
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
sint res = _SUCCESS; int res = _SUCCESS;
pmlmepriv->nic_hdl = (u8 *)padapter; pmlmepriv->nic_hdl = (u8 *)padapter;
...@@ -350,15 +350,6 @@ u8 *rtw_get_beacon_interval_from_ie(u8 *ie) ...@@ -350,15 +350,6 @@ u8 *rtw_get_beacon_interval_from_ie(u8 *ie)
return (ie + 8); return (ie + 8);
} }
int rtw_init_mlme_priv(struct adapter *padapter)/* struct mlme_priv *pmlmepriv) */
{
int res;
res = _rtw_init_mlme_priv(padapter);/* (pmlmepriv); */
return res;
}
void rtw_free_mlme_priv(struct mlme_priv *pmlmepriv) void rtw_free_mlme_priv(struct mlme_priv *pmlmepriv)
{ {
RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("rtw_free_mlme_priv\n")); RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("rtw_free_mlme_priv\n"));
......
...@@ -592,8 +592,6 @@ void rtw_clear_scan_deny(struct adapter *adapter); ...@@ -592,8 +592,6 @@ void rtw_clear_scan_deny(struct adapter *adapter);
void rtw_set_scan_deny_timer_hdl(struct adapter *adapter); void rtw_set_scan_deny_timer_hdl(struct adapter *adapter);
void rtw_set_scan_deny(struct adapter *adapter, u32 ms); void rtw_set_scan_deny(struct adapter *adapter, u32 ms);
extern int _rtw_init_mlme_priv(struct adapter *padapter);
void rtw_free_mlme_priv_ie_data(struct mlme_priv *pmlmepriv); void rtw_free_mlme_priv_ie_data(struct mlme_priv *pmlmepriv);
extern void _rtw_free_mlme_priv(struct mlme_priv *pmlmepriv); extern void _rtw_free_mlme_priv(struct mlme_priv *pmlmepriv);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment