diff options
| author |   Nishka Dasgupta <nishka.dasgupta@yahoo.com> | 2019-03-22 20:08:23 +0530 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-03-24 09:50:02 +0100 |
| commit | cb8de77c78c73541edd32eeb62501af1bd73c76a (patch) | |
| tree | 115f07b04ef4377a5814f81bd4aedf7b214a3d2f /drivers/staging/rtl8723bs | |
| parent | staging: mt7621-mmc: Check for nonzero number of scatterlist entries (diff) | |
| download | linux-dev-cb8de77c78c73541edd32eeb62501af1bd73c76a.tar.xz linux-dev-cb8de77c78c73541edd32eeb62501af1bd73c76a.zip | |
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: Nishka Dasgupta <nishka.dasgupta@yahoo.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/rtl8723bs')
| -rw-r--r-- | drivers/staging/rtl8723bs/core/rtw_mlme.c | 13 | ||||
| -rw-r--r-- | drivers/staging/rtl8723bs/include/rtw_mlme.h | 2 |
2 files changed, 2 insertions, 13 deletions
diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c index 79adc6f1e53a..8f1defdd47f0 100644 --- a/drivers/staging/rtl8723bs/core/rtw_mlme.c +++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c @@ -13,13 +13,13 @@ 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; u8 *pbuf; struct wlan_network *pnetwork; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; - sint res = _SUCCESS; + int res = _SUCCESS; pmlmepriv->nic_hdl = (u8 *)padapter; @@ -350,15 +350,6 @@ u8 *rtw_get_beacon_interval_from_ie(u8 *ie) 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) { RT_TRACE(_module_rtl871x_mlme_c_, _drv_err_, ("rtw_free_mlme_priv\n")); diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme.h b/drivers/staging/rtl8723bs/include/rtw_mlme.h index ed59f16c26c4..82f378c6789e 100644 --- a/drivers/staging/rtl8723bs/include/rtw_mlme.h +++ b/drivers/staging/rtl8723bs/include/rtw_mlme.h @@ -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(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); extern void _rtw_free_mlme_priv(struct mlme_priv *pmlmepriv); |