staging: r8188eu: move xmit status check from hal to rtw_cmd

Move rtl8188e_sreset_xmit_status_check from the hal layer into
rtw_cmd.c.

As this driver supports only the 8188 chipset, there's no need
to go through the hal layer for simple operations that have only
one caller.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Link: https://lore.kernel.org/r/20211212185833.22000-2-martin@kaiser.cx
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/r8188eu/core/rtw_cmd.c b/drivers/staging/r8188eu/core/rtw_cmd.c
index ace3a6342e01cb05dd64b816bb25656c52aef3a3..283ae08ae4cb24ab8420badbdcf47f7b2369127a 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_cmd.c
+++ b/drivers/staging/r8188eu/core/rtw_cmd.c
@@ -950,6 +950,18 @@ static void traffic_status_watchdog(struct adapter *padapter)
        pmlmepriv->LinkDetectInfo.bHigherBusyTxTraffic = bHigherBusyTxTraffic;
 }
 
+static void rtl8188e_sreset_xmit_status_check(struct adapter *padapter)
+{
+       u32 txdma_status;
+
+       txdma_status = rtw_read32(padapter, REG_TXDMA_STATUS);
+       if (txdma_status != 0x00) {
+               DBG_88E("%s REG_TXDMA_STATUS:0x%08x\n", __func__, txdma_status);
+               rtw_write32(padapter, REG_TXDMA_STATUS, txdma_status);
+       }
+       /* total xmit irp = 4 */
+}
+
 static void dynamic_chk_wk_hdl(struct adapter *padapter, u8 *pbuf)
 {
        struct mlme_priv *pmlmepriv;

diff --git a/drivers/staging/r8188eu/hal/rtl8188e_sreset.c b/drivers/staging/r8188eu/hal/rtl8188e_sreset.c
index 7b3ac6e306ced36a66338fdb472f845435a219ad..7fec776a8e8707a9a1c059870a29f96f882c9e9c 100644 (file)
--- a/drivers/staging/r8188eu/hal/rtl8188e_sreset.c
+++ b/drivers/staging/r8188eu/hal/rtl8188e_sreset.c
@@ -6,18 +6,6 @@
 #include "../include/rtl8188e_sreset.h"
 #include "../include/rtl8188e_hal.h"
 
-void rtl8188e_sreset_xmit_status_check(struct adapter *padapter)
-{
-       u32 txdma_status;
-
-       txdma_status = rtw_read32(padapter, REG_TXDMA_STATUS);
-       if (txdma_status != 0x00) {
-               DBG_88E("%s REG_TXDMA_STATUS:0x%08x\n", __func__, txdma_status);
-               rtw_write32(padapter, REG_TXDMA_STATUS, txdma_status);
-       }
-       /* total xmit irp = 4 */
-}
-
 void rtl8188e_sreset_linked_status_check(struct adapter *padapter)
 {
        u32 rx_dma_status = 0;

diff --git a/drivers/staging/r8188eu/include/rtl8188e_sreset.h b/drivers/staging/r8188eu/include/rtl8188e_sreset.h
index bb8b0048fbf9e7346cf0d30052632765d000d165..4e96a5a6e075272f990fd4ffa79e36995dda1f1f 100644 (file)
--- a/drivers/staging/r8188eu/include/rtl8188e_sreset.h
+++ b/drivers/staging/r8188eu/include/rtl8188e_sreset.h
@@ -7,7 +7,6 @@
 #include "osdep_service.h"
 #include "drv_types.h"
 
-void rtl8188e_sreset_xmit_status_check(struct adapter *padapter);
 void rtl8188e_sreset_linked_status_check(struct adapter *padapter);
 
 #endif