staging: r8188eu: remove sreset_reset_value from hal_ops

Remove sreset_reset_value from hal_ops and remove its wrapper
rtw_hal_sreset_reset_value(). Call sreset_reset_value() directly
instead.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20210906190223.11396-17-straube.linux@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/hal/hal_intf.c b/drivers/staging/r8188eu/hal/hal_intf.c
index 712e497f77aba373b74d0de32c082c341b8cdbe9..e5267c23ab8699ad697e93e31e6ab5001c769a14 100644 (file)
--- a/drivers/staging/r8188eu/hal/hal_intf.c
+++ b/drivers/staging/r8188eu/hal/hal_intf.c
@@ -227,12 +227,6 @@ void rtw_hal_sreset_reset(struct adapter *adapt)
                adapt->HalFunc.silentreset(adapt);
 }
 
-void rtw_hal_sreset_reset_value(struct adapter *adapt)
-{
-       if (adapt->HalFunc.sreset_reset_value)
-               adapt->HalFunc.sreset_reset_value(adapt);
-}
-
 void rtw_hal_sreset_xmit_status_check(struct adapter *adapt)
 {
        if (adapt->HalFunc.sreset_xmit_status_check)

diff --git a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
index 82de4eaedf1a8980e7e9138b9466e3010ab1a6b2..222e66656aa9c6b2872e06c0f8bac83e89daa215 100644 (file)
--- a/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
+++ b/drivers/staging/r8188eu/hal/rtl8188e_hal_init.c
@@ -1803,7 +1803,6 @@ void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc)
        pHalFunc->Efuse_PgPacketWrite = &rtl8188e_Efuse_PgPacketWrite;
        pHalFunc->Efuse_WordEnableDataWrite = &rtl8188e_Efuse_WordEnableDataWrite;
 
-       pHalFunc->sreset_reset_value = &sreset_reset_value;
        pHalFunc->silentreset = &rtl8188e_silentreset_for_specific_platform;
        pHalFunc->sreset_xmit_status_check = &rtl8188e_sreset_xmit_status_check;
        pHalFunc->sreset_linked_status_check  = &rtl8188e_sreset_linked_status_check;

diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r8188eu/include/hal_intf.h
index 1cc97dcb06bc04e3d6d7d1f00a9eedb9199db9c7..946896698655fbcf52f76008ed453d47f2a2963d 100644 (file)
--- a/drivers/staging/r8188eu/include/hal_intf.h
+++ b/drivers/staging/r8188eu/include/hal_intf.h
@@ -193,7 +193,6 @@ struct hal_ops {
                                             u16 efuse_addr, u8 word_en,
                                             u8 *data, bool bPseudoTest);
 
-       void (*sreset_reset_value)(struct adapter *padapter);
        void (*silentreset)(struct adapter *padapter);
        void (*sreset_xmit_status_check)(struct adapter *padapter);
        void (*sreset_linked_status_check) (struct adapter *padapter);
@@ -274,7 +273,6 @@ void        rtw_hal_antdiv_rssi_compared(struct adapter *padapter,
                                     struct wlan_bssid_ex *src);
 
 void rtw_hal_sreset_reset(struct adapter *padapter);
-void rtw_hal_sreset_reset_value(struct adapter *padapter);
 void rtw_hal_sreset_xmit_status_check(struct adapter *padapter);
 void rtw_hal_sreset_linked_status_check(struct adapter *padapter);
 u8   rtw_hal_sreset_get_wifi_status(struct adapter *padapter);

diff --git a/drivers/staging/r8188eu/os_dep/os_intfs.c b/drivers/staging/r8188eu/os_dep/os_intfs.c
index e17dea230c3daa3556696a4a72c2fcfa4aa5f8ad..76e8505a74e69655b55d9d04cdd22a97479e4025 100644 (file)
--- a/drivers/staging/r8188eu/os_dep/os_intfs.c
+++ b/drivers/staging/r8188eu/os_dep/os_intfs.c
@@ -816,7 +816,7 @@ u8 rtw_reset_drv_sw(struct adapter *padapter)
 
        _clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY | _FW_UNDER_LINKING);
 
-       rtw_hal_sreset_reset_value(padapter);
+       sreset_reset_value(padapter);
        pwrctrlpriv->pwr_state_check_cnts = 0;
 
        /* mlmeextpriv */