[PATCH 1/6] staging: r8188eu: drop unnecessary wrapper rtw_free_cmd_priv

From: Vihas Makwana
Date: Sun Apr 10 2022 - 12:32:00 EST


Remove the unnecessary wrapper. The logic of rtw_free_cmd_priv can
be moved to _rtw_free_cmd_priv.

Signed-off-by: Vihas Makwana <makvihas@xxxxxxxxx>
---
drivers/staging/r8188eu/core/rtw_cmd.c | 7 +------
drivers/staging/r8188eu/include/rtw_cmd.h | 2 +-
drivers/staging/r8188eu/os_dep/os_intfs.c | 4 ++--
3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/drivers/staging/r8188eu/core/rtw_cmd.c b/drivers/staging/r8188eu/core/rtw_cmd.c
index f036a980e..4d88bc847 100644
--- a/drivers/staging/r8188eu/core/rtw_cmd.c
+++ b/drivers/staging/r8188eu/core/rtw_cmd.c
@@ -87,7 +87,7 @@ void rtw_free_evt_priv(struct evt_priv *pevtpriv)
}
}

-static void _rtw_free_cmd_priv(struct cmd_priv *pcmdpriv)
+void _rtw_free_cmd_priv(struct cmd_priv *pcmdpriv)
{
if (pcmdpriv) {
kfree(pcmdpriv->cmd_allocated_buf);
@@ -157,11 +157,6 @@ u32 rtw_init_evt_priv(struct evt_priv *pevtpriv)
return res;
}

-void rtw_free_cmd_priv(struct cmd_priv *pcmdpriv)
-{
- _rtw_free_cmd_priv(pcmdpriv);
-}
-
static int rtw_cmd_filter(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj)
{
u8 bAllow = false; /* set to true to allow enqueuing cmd when hw_init_completed is false */
diff --git a/drivers/staging/r8188eu/include/rtw_cmd.h b/drivers/staging/r8188eu/include/rtw_cmd.h
index 6b6d560d7..d3a20dc23 100644
--- a/drivers/staging/r8188eu/include/rtw_cmd.h
+++ b/drivers/staging/r8188eu/include/rtw_cmd.h
@@ -83,7 +83,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);
-void rtw_free_cmd_priv(struct cmd_priv *pcmdpriv);
+void _rtw_free_cmd_priv(struct cmd_priv *pcmdpriv);

u32 rtw_init_evt_priv(struct evt_priv *pevtpriv);
void rtw_free_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 390d1cc0e..702e5b350 100644
--- a/drivers/staging/r8188eu/os_dep/os_intfs.c
+++ b/drivers/staging/r8188eu/os_dep/os_intfs.c
@@ -534,7 +534,7 @@ u8 rtw_init_drv_sw(struct adapter *padapter)
rtw_free_evt_priv(&padapter->evtpriv);

free_cmd_priv:
- rtw_free_cmd_priv(&padapter->cmdpriv);
+ _rtw_free_cmd_priv(&padapter->cmdpriv);

return _FAIL;
}
@@ -572,7 +572,7 @@ u8 rtw_free_drv_sw(struct adapter *padapter)

free_mlme_ext_priv(&padapter->mlmeextpriv);

- rtw_free_cmd_priv(&padapter->cmdpriv);
+ _rtw_free_cmd_priv(&padapter->cmdpriv);

rtw_free_evt_priv(&padapter->evtpriv);

--
2.30.2