From cfc7ef740342e6c9ea61dc832eda963012f27f7f Mon Sep 17 00:00:00 2001 From: Madhumitha Prabakaran Date: Sun, 17 Mar 2019 16:33:54 -0500 Subject: [PATCH] staging: rtl8723bs: Remove wrapper functions and change function names Drop wrappers rtw_init_cmd_priv and rtw_init_evt_priv and remove their function declarations, as their only purpose is to call other functions. Change function names from _rtw_init_cmd_priv to rtw_init_cmd_priv, and _rtw_init_evt_priv to rtw_init_evt_priv in function definitions and function declarations. Also, remove externs in function declarations rtw_init_cmd_priv and rtw_init_evt_priv, to maintain Linux kernel coding style. Signed-off-by: Madhumitha Prabakaran Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8723bs/core/rtw_cmd.c | 20 ++------------------ drivers/staging/rtl8723bs/include/cmd_osdep.h | 4 ++-- drivers/staging/rtl8723bs/include/rtw_cmd.h | 2 -- 3 files changed, 4 insertions(+), 22 deletions(-) diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c b/drivers/staging/rtl8723bs/core/rtw_cmd.c index 91520ca..793bc50 100644 --- a/drivers/staging/rtl8723bs/core/rtw_cmd.c +++ b/drivers/staging/rtl8723bs/core/rtw_cmd.c @@ -162,7 +162,7 @@ Caller and the rtw_cmd_thread can protect cmd_q by spin_lock. No irqsave is necessary. */ -sint _rtw_init_cmd_priv(struct cmd_priv *pcmdpriv) +sint rtw_init_cmd_priv(struct cmd_priv *pcmdpriv) { sint res = _SUCCESS; @@ -201,7 +201,7 @@ exit: } static void c2h_wk_callback(_workitem *work); -sint _rtw_init_evt_priv(struct evt_priv *pevtpriv) +sint rtw_init_evt_priv(struct evt_priv *pevtpriv) { sint res = _SUCCESS; @@ -295,22 +295,6 @@ struct cmd_obj *_rtw_dequeue_cmd(struct __queue *queue) return obj; } -u32 rtw_init_cmd_priv(struct cmd_priv *pcmdpriv) -{ - u32 res; - - res = _rtw_init_cmd_priv(pcmdpriv); - return res; -} - -u32 rtw_init_evt_priv(struct evt_priv *pevtpriv) -{ - int res; - - res = _rtw_init_evt_priv(pevtpriv); - return res; -} - void rtw_free_evt_priv(struct evt_priv *pevtpriv) { RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, ("rtw_free_evt_priv\n")); diff --git a/drivers/staging/rtl8723bs/include/cmd_osdep.h b/drivers/staging/rtl8723bs/include/cmd_osdep.h index 0749936..8ed9137 100644 --- a/drivers/staging/rtl8723bs/include/cmd_osdep.h +++ b/drivers/staging/rtl8723bs/include/cmd_osdep.h @@ -8,8 +8,8 @@ #define __CMD_OSDEP_H_ -extern sint _rtw_init_cmd_priv (struct cmd_priv *pcmdpriv); -extern sint _rtw_init_evt_priv(struct evt_priv *pevtpriv); +sint rtw_init_cmd_priv(struct cmd_priv *pcmdpriv); +sint rtw_init_evt_priv(struct evt_priv *pevtpriv); extern void _rtw_free_evt_priv (struct evt_priv *pevtpriv); extern void _rtw_free_cmd_priv (struct cmd_priv *pcmdpriv); extern sint _rtw_enqueue_cmd(struct __queue *queue, struct cmd_obj *obj); diff --git a/drivers/staging/rtl8723bs/include/rtw_cmd.h b/drivers/staging/rtl8723bs/include/rtw_cmd.h index 299b5553..fa4ebc3 100644 --- a/drivers/staging/rtl8723bs/include/rtw_cmd.h +++ b/drivers/staging/rtl8723bs/include/rtw_cmd.h @@ -129,10 +129,8 @@ extern void rtw_free_cmd_obj(struct cmd_obj *pcmd); void rtw_stop_cmd_thread(struct adapter *adapter); int rtw_cmd_thread(void *context); -extern u32 rtw_init_cmd_priv (struct cmd_priv *pcmdpriv); extern void rtw_free_cmd_priv (struct cmd_priv *pcmdpriv); -extern u32 rtw_init_evt_priv (struct evt_priv *pevtpriv); extern void rtw_free_evt_priv (struct evt_priv *pevtpriv); extern void rtw_evt_notify_isr(struct evt_priv *pevtpriv); -- 2.7.4