[PATCH 2/6] staging: r8188eu: drop unnecessary wrapper rtw_init_cmd_priv
From: Vihas Makwana
Date: Sun Apr 10 2022 - 12:32:07 EST
Remove the unnecessary wrapper. The logic of rtw_init_cmd_priv can
be moved to _rtw_init_cmd_priv.
Signed-off-by: Vihas Makwana <makvihas@xxxxxxxxx>
---
drivers/staging/r8188eu/core/rtw_cmd.c | 11 +----------
drivers/staging/r8188eu/include/rtw_cmd.h | 2 +-
drivers/staging/r8188eu/os_dep/os_intfs.c | 2 +-
3 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/r8188eu/core/rtw_cmd.c b/drivers/staging/r8188eu/core/rtw_cmd.c
index 4d88bc847..d843e9997 100644
--- a/drivers/staging/r8188eu/core/rtw_cmd.c
+++ b/drivers/staging/r8188eu/core/rtw_cmd.c
@@ -15,7 +15,7 @@
* No irqsave is necessary.
*/
-static int _rtw_init_cmd_priv(struct cmd_priv *pcmdpriv)
+int _rtw_init_cmd_priv(struct cmd_priv *pcmdpriv)
{
int res = _SUCCESS;
@@ -139,15 +139,6 @@ static 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;
diff --git a/drivers/staging/r8188eu/include/rtw_cmd.h b/drivers/staging/r8188eu/include/rtw_cmd.h
index d3a20dc23..ab47d3785 100644
--- a/drivers/staging/r8188eu/include/rtw_cmd.h
+++ b/drivers/staging/r8188eu/include/rtw_cmd.h
@@ -82,7 +82,7 @@ void rtw_free_cmd_obj(struct cmd_obj *pcmd);
int rtw_cmd_thread(void *context);
-u32 rtw_init_cmd_priv(struct cmd_priv *pcmdpriv);
+int _rtw_init_cmd_priv(struct cmd_priv *pcmdpriv);
void _rtw_free_cmd_priv(struct cmd_priv *pcmdpriv);
u32 rtw_init_evt_priv(struct evt_priv *pevtpriv);
diff --git a/drivers/staging/r8188eu/os_dep/os_intfs.c b/drivers/staging/r8188eu/os_dep/os_intfs.c
index 702e5b350..c611e9246 100644
--- a/drivers/staging/r8188eu/os_dep/os_intfs.c
+++ b/drivers/staging/r8188eu/os_dep/os_intfs.c
@@ -466,7 +466,7 @@ u8 rtw_reset_drv_sw(struct adapter *padapter)
u8 rtw_init_drv_sw(struct adapter *padapter)
{
- if ((rtw_init_cmd_priv(&padapter->cmdpriv)) == _FAIL) {
+ if ((_rtw_init_cmd_priv(&padapter->cmdpriv)) == _FAIL) {
dev_err(dvobj_to_dev(padapter->dvobj), "rtw_init_cmd_priv failed\n");
return _FAIL;
}
--
2.30.2