Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc8ae7e5 authored by Jes Sorensen's avatar Jes Sorensen Committed by Greg Kroah-Hartman
Browse files

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



Signed-off-by: default avatarJes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f39a3d15

drivers/staging/rtl8723au/core/rtw_cmd.c

+11 −23
Original line number Diff line number Diff line
@@ -230,10 +230,17 @@ int _rtw_init_evt_priv23a(struct evt_priv *pevtpriv) 
	return res;

}



void _rtw_free_evt_priv23a (struct evt_priv *pevtpriv)

u32 rtw_init_evt_priv23a(struct evt_priv *pevtpriv)

{

	int res;



	res = _rtw_init_evt_priv23a(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);
@@ -245,25 +252,6 @@ void _rtw_free_evt_priv23a (struct evt_priv *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;



	res = _rtw_init_evt_priv23a(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"));

	_rtw_free_evt_priv23a(pevtpriv);

}



void rtw_free_cmd_priv23a(struct cmd_priv *pcmdpriv)

drivers/staging/rtl8723au/include/cmd_osdep.h

+0 −1
Original line number Diff line number Diff line
@@ -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