staging: rtl8723bs: Remove function pointer init_xmit_priv

Remove function pointer init_xmit_priv and use rtl8723bs_init_xmit_priv
directly to increase readability.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/322d2412d89ae384365ec1d000bb0fc62128a261.1727966761.git.philipp.g.hortmann@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723bs/hal/hal_intf.c b/drivers/staging/rtl8723bs/hal/hal_intf.c
index 983218cdbfec9979ec54b9a379aef8add4aaa0b3..1d1e4f438e7b8ca61acf18dd281d71779c9bc277 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/hal_intf.c
+++ b/drivers/staging/rtl8723bs/hal/hal_intf.c
@@ -220,9 +220,7 @@ s32 rtw_hal_mgnt_xmit(struct adapter *padapter, struct xmit_frame *pmgntframe)
 
 s32    rtw_hal_init_xmit_priv(struct adapter *padapter)
 {
-       if (padapter->HalFunc.init_xmit_priv)
-               return padapter->HalFunc.init_xmit_priv(padapter);
-       return _FAIL;
+       return rtl8723bs_init_xmit_priv(padapter);
 }
 
 void rtw_hal_free_xmit_priv(struct adapter *padapter)

diff --git a/drivers/staging/rtl8723bs/hal/sdio_halinit.c b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
index d7941fdf42e1150ad795f065234b9fc9248d8cc9..55cf827fc255814d7f51deae22374a501018ca5c 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/sdio_halinit.c
+++ b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
@@ -1259,7 +1259,6 @@ void rtl8723bs_set_hal_ops(struct adapter *padapter)
 
        rtl8723b_set_hal_ops(pHalFunc);
 
-       pHalFunc->init_xmit_priv = &rtl8723bs_init_xmit_priv;
        pHalFunc->free_xmit_priv = &rtl8723bs_free_xmit_priv;
 
        pHalFunc->init_recv_priv = &rtl8723bs_init_recv_priv;

diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging/rtl8723bs/include/hal_intf.h
index bc2696f2308516d4f69f721cbb66601174e49fa0..696a71c01bf9f11d53ea4282c4f53ee3c233c99e 100644 (file)
--- a/drivers/staging/rtl8723bs/include/hal_intf.h
+++ b/drivers/staging/rtl8723bs/include/hal_intf.h
@@ -162,7 +162,6 @@ enum hal_intf_ps_func {
 typedef s32 (*c2h_id_filter)(u8 *c2h_evt);
 
 struct hal_ops {
-       s32     (*init_xmit_priv)(struct adapter *padapter);
        void (*free_xmit_priv)(struct adapter *padapter);
 
        s32     (*init_recv_priv)(struct adapter *padapter);