staging: rtl8723bs: Remove function pointer hal_deinit

Remove function pointer hal_deinit and use rtl8723bs_hal_deinit directly
to increase readability.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/b0acbbdc372e01baabd1d98f824bc2a3c6c4c600.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 684d31360f4b1680c3a43f4c8fe33ce6679fb5c4..d9121e13fe69f605b237e52a87ba6562b9a1c3bd 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/hal_intf.c
+++ b/drivers/staging/rtl8723bs/hal/hal_intf.c
@@ -107,7 +107,7 @@ uint rtw_hal_deinit(struct adapter *padapter)
        uint status = _SUCCESS;
        struct dvobj_priv *dvobj = adapter_to_dvobj(padapter);
 
-       status = padapter->HalFunc.hal_deinit(padapter);
+       status = rtl8723bs_hal_deinit(padapter);
 
        if (status == _SUCCESS) {
                padapter = dvobj->padapters;

diff --git a/drivers/staging/rtl8723bs/hal/sdio_halinit.c b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
index b4819ff2928fcc2d4fa72f36b59a53adc619e584..d7941fdf42e1150ad795f065234b9fc9248d8cc9 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/sdio_halinit.c
+++ b/drivers/staging/rtl8723bs/hal/sdio_halinit.c
@@ -884,7 +884,7 @@ static void CardDisableRTL8723BSdio(struct adapter *padapter)
        HalPwrSeqCmdParsing(padapter, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_SDIO_MSK, rtl8723B_card_disable_flow);
 }
 
-static u32 rtl8723bs_hal_deinit(struct adapter *padapter)
+u32 rtl8723bs_hal_deinit(struct adapter *padapter)
 {
        struct dvobj_priv *psdpriv = padapter->dvobj;
        struct debug_priv *pdbgpriv = &psdpriv->drv_dbg;
@@ -1259,8 +1259,6 @@ void rtl8723bs_set_hal_ops(struct adapter *padapter)
 
        rtl8723b_set_hal_ops(pHalFunc);
 
-       pHalFunc->hal_deinit = &rtl8723bs_hal_deinit;
-
        pHalFunc->init_xmit_priv = &rtl8723bs_init_xmit_priv;
        pHalFunc->free_xmit_priv = &rtl8723bs_free_xmit_priv;
 

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

diff --git a/drivers/staging/rtl8723bs/include/rtl8723b_xmit.h b/drivers/staging/rtl8723bs/include/rtl8723b_xmit.h
index 5e3483cb22db22e46b8fbc01174ef92c679e49e1..ac4ca7e05b9bf5fbb8b876c6f00c22953239359f 100644 (file)
--- a/drivers/staging/rtl8723bs/include/rtl8723b_xmit.h
+++ b/drivers/staging/rtl8723bs/include/rtl8723b_xmit.h
@@ -406,6 +406,7 @@ 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);
+u32 rtl8723bs_hal_deinit(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);