hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Jes Sorensen 2014-04-26 18:55:00 +02:00 committed by Greg Kroah-Hartman
parent f39a3d1598
commit fc8ae7e548
2 changed files with 11 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
drivers/staging/rtl8723au/core/rtw_cmd.c
View File

@ -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)

1
drivers/staging/rtl8723au/include/cmd_osdep.h
View File

@ -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