staging: rtl8723bs: Remove function pointer hal_init

Remove function pointer hal_init and use rtl8723bs_hal_init directly to
increase readability.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/5c838981141aad1275cbcbe862ac7885de9bb8e9.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 d675a5eeaddb1bda650d914c8caedbc65bd8f2e6..684d31360f4b1680c3a43f4c8fe33ce6679fb5c4 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/hal_intf.c
+++ b/drivers/staging/rtl8723bs/hal/hal_intf.c
@@ -78,7 +78,7 @@ uint rtw_hal_init(struct adapter *padapter)
        uint status;
        struct dvobj_priv *dvobj = adapter_to_dvobj(padapter);
 
-       status = padapter->HalFunc.hal_init(padapter);
+       status = rtl8723bs_hal_init(padapter);
 
        if (status == _SUCCESS) {
                rtw_hal_init_opmode(padapter);

diff --git a/drivers/staging/rtl8723bs/hal/sdio_halinit.c b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
index c54d6dc1a495a1044eedcba528247c3fac2a372b..b4819ff2928fcc2d4fa72f36b59a53adc619e584 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/sdio_halinit.c
+++ b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
@@ -583,7 +583,7 @@ static bool HalDetectPwrDownMode(struct adapter *Adapter)
        return pHalData->pwrdown;
 }      /*  HalDetectPwrDownMode */
 
-static u32 rtl8723bs_hal_init(struct adapter *padapter)
+u32 rtl8723bs_hal_init(struct adapter *padapter)
 {
        s32 ret;
        struct hal_com_data *pHalData;
@@ -1259,7 +1259,6 @@ void rtl8723bs_set_hal_ops(struct adapter *padapter)
 
        rtl8723b_set_hal_ops(pHalFunc);
 
-       pHalFunc->hal_init = &rtl8723bs_hal_init;
        pHalFunc->hal_deinit = &rtl8723bs_hal_deinit;
 
        pHalFunc->init_xmit_priv = &rtl8723bs_init_xmit_priv;

diff --git a/drivers/staging/rtl8723bs/include/hal_intf.h b/drivers/staging/rtl8723bs/include/hal_intf.h
index d959be13fcf38b8161245e61b31c2f86ecfcb0f9..fc3a94e407213248b8be08c85824b2f21ca7d873 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 {
-       u32 (*hal_init)(struct adapter *padapter);
        u32 (*hal_deinit)(struct adapter *padapter);
 
        void (*free_hal_data)(struct adapter *padapter);

diff --git a/drivers/staging/rtl8723bs/include/rtl8723b_xmit.h b/drivers/staging/rtl8723bs/include/rtl8723b_xmit.h
index ad2542d0cabe26ac7fc52137cc961e9f94706937..5e3483cb22db22e46b8fbc01174ef92c679e49e1 100644 (file)
--- a/drivers/staging/rtl8723bs/include/rtl8723b_xmit.h
+++ b/drivers/staging/rtl8723bs/include/rtl8723b_xmit.h
@@ -405,6 +405,7 @@ struct txdesc_8723b {
 void rtl8723b_update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem);
 void rtl8723b_fill_fake_txdesc(struct adapter *padapter, u8 *pDesc, u32 BufferLen, u8 IsPsPoll, u8 IsBTQosNull, u8 bDataFrame);
 
+u32 rtl8723bs_hal_init(struct adapter *padapter);
 s32 rtl8723bs_init_xmit_priv(struct adapter *padapter);
 void rtl8723bs_free_xmit_priv(struct adapter *padapter);
 s32 rtl8723bs_hal_xmit(struct adapter *padapter, struct xmit_frame *pxmitframe);