[PATCH 05/15] staging: rtl8723bs: Remove function pointer free_xmit_priv

From: Philipp Hortmann
Date: Sat Oct 05 2024 - 16:35:52 EST


Remove function pointer free_xmit_priv and use rtl8723bs_free_xmit_priv
directly to increase readability.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@xxxxxxxxx>
---
drivers/staging/rtl8723bs/hal/hal_intf.c | 3 +--
drivers/staging/rtl8723bs/hal/sdio_halinit.c | 2 --
drivers/staging/rtl8723bs/include/hal_intf.h | 2 --
3 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/staging/rtl8723bs/hal/hal_intf.c b/drivers/staging/rtl8723bs/hal/hal_intf.c
index 1d1e4f438e7b..bbead941289d 100644
--- a/drivers/staging/rtl8723bs/hal/hal_intf.c
+++ b/drivers/staging/rtl8723bs/hal/hal_intf.c
@@ -225,8 +225,7 @@ s32 rtw_hal_init_xmit_priv(struct adapter *padapter)

void rtw_hal_free_xmit_priv(struct adapter *padapter)
{
- if (padapter->HalFunc.free_xmit_priv)
- padapter->HalFunc.free_xmit_priv(padapter);
+ rtl8723bs_free_xmit_priv(padapter);
}

s32 rtw_hal_init_recv_priv(struct adapter *padapter)
diff --git a/drivers/staging/rtl8723bs/hal/sdio_halinit.c b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
index 55cf827fc255..ef70ada68f2c 100644
--- a/drivers/staging/rtl8723bs/hal/sdio_halinit.c
+++ b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
@@ -1259,8 +1259,6 @@ void rtl8723bs_set_hal_ops(struct adapter *padapter)

rtl8723b_set_hal_ops(pHalFunc);

- pHalFunc->free_xmit_priv = &rtl8723bs_free_xmit_priv;
-
pHalFunc->init_recv_priv = &rtl8723bs_init_recv_priv;
pHalFunc->free_recv_priv = &rtl8723bs_free_recv_priv;

diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging/rtl8723bs/include/hal_intf.h
index 696a71c01bf9..0782a13074d7 100644
--- a/drivers/staging/rtl8723bs/include/hal_intf.h
+++ b/drivers/staging/rtl8723bs/include/hal_intf.h
@@ -162,8 +162,6 @@ enum hal_intf_ps_func {
typedef s32 (*c2h_id_filter)(u8 *c2h_evt);

struct hal_ops {
- void (*free_xmit_priv)(struct adapter *padapter);
-
s32 (*init_recv_priv)(struct adapter *padapter);
void (*free_recv_priv)(struct adapter *padapter);

--
2.43.0