staging: rtl8723bs: Remove function pointer init_recv_priv

Remove function pointer init_recv_priv and use rtl8723bs_init_recv_priv
directly to increase readability.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/d9576e47920b045d702069fd3167e38d889412e7.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 bbead941289d58c51dedb61a22ef84fac1e40eca..d571bf81ab2be1c3aa7c0743a577ef99d0279f98 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/hal_intf.c
+++ b/drivers/staging/rtl8723bs/hal/hal_intf.c
@@ -230,10 +230,7 @@ void rtw_hal_free_xmit_priv(struct adapter *padapter)
 
 s32    rtw_hal_init_recv_priv(struct adapter *padapter)
 {
-       if (padapter->HalFunc.init_recv_priv)
-               return padapter->HalFunc.init_recv_priv(padapter);
-
-       return _FAIL;
+       return rtl8723bs_init_recv_priv(padapter);
 }
 
 void rtw_hal_free_recv_priv(struct adapter *padapter)

diff --git a/drivers/staging/rtl8723bs/hal/sdio_halinit.c b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
index ef70ada68f2c88c34b27381472f239647902ae4a..8d2a44726fc7d751e459ab7d91d502bd9d42f79e 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_recv_priv = &rtl8723bs_init_recv_priv;
        pHalFunc->free_recv_priv = &rtl8723bs_free_recv_priv;
 
        pHalFunc->init_default_value = &rtl8723bs_init_default_value;

diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging/rtl8723bs/include/hal_intf.h
index 0782a13074d76d78daca9c9945af9ee8d080b660..cc01b8d56498d72cdabdfcd48c2bf8ad692c73fe 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_recv_priv)(struct adapter *padapter);
        void (*free_recv_priv)(struct adapter *padapter);
 
        void (*dm_init)(struct adapter *padapter);