From: Jes Sorensen Date: Sat, 26 Apr 2014 16:54:59 +0000 (+0200) Subject: staging: rtl8723au: Fold _rtw_free_cmd_priv23a() into rtw_free_cmd_priv23a() X-Git-Tag: firefly_0821_release~176^2~3465^2~39^2~1215 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=f39a3d1598ec156331d84c125bfbddab6822f36f;p=firefly-linux-kernel-4.4.55.git staging: rtl8723au: Fold _rtw_free_cmd_priv23a() into rtw_free_cmd_priv23a() Signed-off-by: Jes Sorensen Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/rtl8723au/core/rtw_cmd.c b/drivers/staging/rtl8723au/core/rtw_cmd.c index 813897f82185..0032e36adb16 100644 --- a/drivers/staging/rtl8723au/core/rtw_cmd.c +++ b/drivers/staging/rtl8723au/core/rtw_cmd.c @@ -250,14 +250,6 @@ void _rtw_free_evt_priv23a (struct evt_priv *pevtpriv) ("-_rtw_free_evt_priv23a\n")); } -void _rtw_free_cmd_priv23a(struct cmd_priv *pcmdpriv) -{ - if (pcmdpriv) { - kfree(pcmdpriv->cmd_allocated_buf); - kfree(pcmdpriv->rsp_allocated_buf); - } -} - u32 rtw_init_evt_priv23a(struct evt_priv *pevtpriv) { int res; @@ -278,7 +270,11 @@ void rtw_free_cmd_priv23a(struct cmd_priv *pcmdpriv) { RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, ("rtw_free_cmd_priv23a\n")); - _rtw_free_cmd_priv23a(pcmdpriv); + + if (pcmdpriv) { + kfree(pcmdpriv->cmd_allocated_buf); + kfree(pcmdpriv->rsp_allocated_buf); + } } static int rtw_cmd_filter(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj) diff --git a/drivers/staging/rtl8723au/include/cmd_osdep.h b/drivers/staging/rtl8723au/include/cmd_osdep.h index 4866bee04054..6d24e425afb2 100644 --- a/drivers/staging/rtl8723au/include/cmd_osdep.h +++ b/drivers/staging/rtl8723au/include/cmd_osdep.h @@ -20,7 +20,6 @@ int _rtw_init_evt_priv23a(struct evt_priv *pevtpriv); void _rtw_free_evt_priv23a(struct evt_priv *pevtpriv); -void _rtw_free_cmd_priv23a(struct cmd_priv *pcmdpriv); int _rtw_enqueue_cmd23a(struct rtw_queue *queue, struct cmd_obj *obj); #endif