staging: rtl8723au: Fold _rtw_free_evt_priv23a() into rtw_free_evt_priv23a()

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723au/core/rtw_cmd.c b/drivers/staging/rtl8723au/core/rtw_cmd.c
index 0032e36adb16ac64f6be4cfb1cd61e23ec7979d0..d3b2ea1cd48b7a4c5b73b8e8f6bef24fcaa31019 100644 (file)
--- a/drivers/staging/rtl8723au/core/rtw_cmd.c
+++ b/drivers/staging/rtl8723au/core/rtw_cmd.c
@@ -230,26 +230,6 @@ int _rtw_init_evt_priv23a(struct evt_priv *pevtpriv)
        return res;
 }
 
-void _rtw_free_evt_priv23a (struct evt_priv *pevtpriv)
-{
-       RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_,
-                ("+_rtw_free_evt_priv23a\n"));
-       cancel_work_sync(&pevtpriv->c2h_wk);
-       while(pevtpriv->c2h_wk_alive)
-               msleep(10);
-
-       while (!rtw_cbuf_empty23a(pevtpriv->c2h_queue)) {
-               void *c2h;
-               if ((c2h = rtw_cbuf_pop23a(pevtpriv->c2h_queue)) != NULL &&
-                   c2h != (void *)pevtpriv) {
-                       kfree(c2h);
-               }
-       }
-
-       RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_,
-                ("-_rtw_free_evt_priv23a\n"));
-}
-
 u32 rtw_init_evt_priv23a(struct evt_priv *pevtpriv)
 {
        int res;
@@ -261,9 +241,17 @@ u32 rtw_init_evt_priv23a(struct evt_priv *pevtpriv)
 
 void rtw_free_evt_priv23a(struct evt_priv *pevtpriv)
 {
-       RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_,
-                ("rtw_free_evt_priv23a\n"));
-       _rtw_free_evt_priv23a(pevtpriv);
+       cancel_work_sync(&pevtpriv->c2h_wk);
+       while (pevtpriv->c2h_wk_alive)
+               msleep(10);
+
+       while (!rtw_cbuf_empty23a(pevtpriv->c2h_queue)) {
+               void *c2h;
+               if ((c2h = rtw_cbuf_pop23a(pevtpriv->c2h_queue)) != NULL &&
+                   c2h != (void *)pevtpriv) {
+                       kfree(c2h);
+               }
+       }
 }
 
 void rtw_free_cmd_priv23a(struct cmd_priv *pcmdpriv)

diff --git a/drivers/staging/rtl8723au/include/cmd_osdep.h b/drivers/staging/rtl8723au/include/cmd_osdep.h
index 6d24e425afb21be6d89f10f4d7ec1102be14bed4..fd7ac4d67dc9d831641b1ada6ce9c2e120927283 100644 (file)
--- a/drivers/staging/rtl8723au/include/cmd_osdep.h
+++ b/drivers/staging/rtl8723au/include/cmd_osdep.h
@@ -19,7 +19,6 @@
 #include <drv_types.h>
 
 int _rtw_init_evt_priv23a(struct evt_priv *pevtpriv);
-void _rtw_free_evt_priv23a(struct      evt_priv *pevtpriv);
 int _rtw_enqueue_cmd23a(struct rtw_queue *queue, struct cmd_obj *obj);
 
 #endif