staging: r8188eu: remove silentreset from hal_ops

Remove silentreset from hal_ops and remove its wrapper
rtw_hal_sreset_reset().
Call rtl8188e_silentreset_for_specific_platform() directly instead.

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Link: https://lore.kernel.org/r/20210906190223.11396-18-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 e5267c23ab8699ad697e93e31e6ab5001c769a14..51f6160f7decf29c309ce8c309f146b05234a626 100644 (file)
--- a/drivers/staging/r8188eu/hal/hal_intf.c
+++ b/drivers/staging/r8188eu/hal/hal_intf.c
@@ -221,12 +221,6 @@ void rtw_hal_antdiv_rssi_compared(struct adapter *adapt,
                adapt->HalFunc.AntDivCompareHandler(adapt, dst, src);
 }
 
-void rtw_hal_sreset_reset(struct adapter *adapt)
-{
-       if (adapt->HalFunc.silentreset)
-               adapt->HalFunc.silentreset(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 222e66656aa9c6b2872e06c0f8bac83e89daa215..f9852eae7c7475cbbbca1ef1130e7c4a71bf8ee5 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->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;
        pHalFunc->sreset_get_wifi_status  = &sreset_get_wifi_status;

diff --git a/drivers/staging/r8188eu/include/hal_intf.h b/drivers/staging/r8188eu/include/hal_intf.h
index 946896698655fbcf52f76008ed453d47f2a2963d..1a85f11ba5961dcfbb963df76aa45faeba4a6aed 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 (*silentreset)(struct adapter *padapter);
        void (*sreset_xmit_status_check)(struct adapter *padapter);
        void (*sreset_linked_status_check) (struct adapter *padapter);
        u8 (*sreset_get_wifi_status)(struct adapter *padapter);
@@ -272,7 +271,6 @@ void        rtw_hal_antdiv_rssi_compared(struct adapter *padapter,
                                     struct wlan_bssid_ex *dst,
                                     struct wlan_bssid_ex *src);
 
-void rtw_hal_sreset_reset(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/ioctl_linux.c b/drivers/staging/r8188eu/os_dep/ioctl_linux.c
index c7229878ee539d3259de7c9af4a6a132b649e02f..803caf94da4c9aafdfecaf5912dcf5edfa991047 100644 (file)
--- a/drivers/staging/r8188eu/os_dep/ioctl_linux.c
+++ b/drivers/staging/r8188eu/os_dep/ioctl_linux.c
@@ -4304,7 +4304,7 @@ static int rtw_dbg_port(struct net_device *dev,
                case 0x0f:
                        if (extra_arg == 0) {
                                DBG_88E("###### silent reset test.......#####\n");
-                               rtw_hal_sreset_reset(padapter);
+                               rtl8188e_silentreset_for_specific_platform(padapter);
                        }
                        break;
                case 0x15: