staging: rtl8723bs: Remove function rtw_alloc_network()

Remove function rtw_alloc_network() as all it does is call
_rtw_alloc_network().
Rename _rtw_alloc_network() to rtw_alloc_network().
Change references to _rtw_alloc_network() to refer to
rtw_alloc_network().
Issue first noticed while using Coccinelle and ret.cocci.

Signed-off-by: Nishka Dasgupta <nishka.dasgupta@yahoo.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c b/drivers/staging/rtl8723bs/core/rtw_cmd.c
index 04c6927dab8b38391c17215e76794ee7c09646e5..ecaa769f12e68363d718f20ecce7437c5f1a92dc 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_cmd.c
+++ b/drivers/staging/rtl8723bs/core/rtw_cmd.c
@@ -2100,7 +2100,7 @@ void rtw_createbss_cmd_callback(struct adapter *padapter, struct cmd_obj *pcmd)
 
                rtw_indicate_connect(padapter);
        } else {
-               pwlan = _rtw_alloc_network(pmlmepriv);
+               pwlan = rtw_alloc_network(pmlmepriv);
                spin_lock_bh(&(pmlmepriv->scanned_queue.lock));
                if (pwlan == NULL) {
                        pwlan = rtw_get_oldest_wlan_network(&pmlmepriv->scanned_queue);

diff --git a/drivers/staging/rtl8723bs/core/rtw_mlme.c b/drivers/staging/rtl8723bs/core/rtw_mlme.c
index 8b3a095f0c4c0934839526f269f2513985ec8bec..552df9e3cd14105dbc9a63f48b27e1c3427a9652 100644 (file)
--- a/drivers/staging/rtl8723bs/core/rtw_mlme.c
+++ b/drivers/staging/rtl8723bs/core/rtw_mlme.c
@@ -143,7 +143,7 @@ struct      wlan_network *_rtw_dequeue_network(struct __queue *queue)
 }
 */
 
-struct wlan_network *_rtw_alloc_network(struct mlme_priv *pmlmepriv)/* _queue *free_queue) */
+struct wlan_network *rtw_alloc_network(struct  mlme_priv *pmlmepriv)
 {
        struct  wlan_network    *pnetwork;
        struct __queue *free_queue = &pmlmepriv->free_bss_pool;
@@ -161,7 +161,8 @@ struct      wlan_network *_rtw_alloc_network(struct mlme_priv *pmlmepriv)/* _queue *f
 
        list_del_init(&pnetwork->list);
 
-       RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("_rtw_alloc_network: ptr =%p\n", plist));
+       RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_,
+                ("rtw_alloc_network: ptr =%p\n", plist));
        pnetwork->network_type = 0;
        pnetwork->fixed = false;
        pnetwork->last_scanned = jiffies;
@@ -366,15 +367,6 @@ static struct      wlan_network *rtw_dequeue_network(struct __queue *queue)
 }
 */
 
-struct wlan_network *rtw_alloc_network(struct  mlme_priv *pmlmepriv);
-struct wlan_network *rtw_alloc_network(struct  mlme_priv *pmlmepriv)/* _queue  *free_queue) */
-{
-       struct  wlan_network    *pnetwork;
-
-       pnetwork = _rtw_alloc_network(pmlmepriv);
-       return pnetwork;
-}
-
 void rtw_free_network_nolock(struct adapter *padapter, struct wlan_network *pnetwork);
 void rtw_free_network_nolock(struct adapter *padapter, struct wlan_network *pnetwork)
 {

diff --git a/drivers/staging/rtl8723bs/include/rtw_mlme.h b/drivers/staging/rtl8723bs/include/rtw_mlme.h
index 82f378c6789e31eff26329834fabeff93d662851..2693b554f4146c83814c677f443c35fb5b5932c8 100644 (file)
--- a/drivers/staging/rtl8723bs/include/rtw_mlme.h
+++ b/drivers/staging/rtl8723bs/include/rtw_mlme.h
@@ -598,7 +598,7 @@ extern void _rtw_free_mlme_priv(struct mlme_priv *pmlmepriv);
 
 /* extern struct wlan_network* _rtw_dequeue_network(struct __queue *queue); */
 
-extern struct wlan_network* _rtw_alloc_network(struct mlme_priv *pmlmepriv);
+extern struct wlan_network *rtw_alloc_network(struct mlme_priv *pmlmepriv);
 
 
 extern void _rtw_free_network(struct mlme_priv *pmlmepriv, struct wlan_network *pnetwork, u8 isfreeall);