staging: r8188eu: remove rtl8188e_silentreset_for_specific_platform()

Function rtl8188e_silentreset_for_specific_platform() is empty.
Remove it and remove code that does nothing other than using the
unwanted DBG_88E macro now.

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

diff --git a/drivers/staging/r8188eu/hal/rtl8188e_sreset.c b/drivers/staging/r8188eu/hal/rtl8188e_sreset.c
index 16fa249e35d3fd427302daaa62e01201f00a67f5..ea793fef6f10d294f2db65f978ea962fb1f4758b 100644 (file)
--- a/drivers/staging/r8188eu/hal/rtl8188e_sreset.c
+++ b/drivers/staging/r8188eu/hal/rtl8188e_sreset.c
@@ -6,10 +6,6 @@
 #include "../include/rtl8188e_sreset.h"
 #include "../include/rtl8188e_hal.h"
 
-void rtl8188e_silentreset_for_specific_platform(struct adapter *padapter)
-{
-}
-
 void rtl8188e_sreset_xmit_status_check(struct adapter *padapter)
 {
        struct hal_data_8188e   *pHalData = GET_HAL_DATA(padapter);
@@ -24,7 +20,6 @@ void rtl8188e_sreset_xmit_status_check(struct adapter *padapter)
        if (txdma_status != 0x00) {
                DBG_88E("%s REG_TXDMA_STATUS:0x%08x\n", __func__, txdma_status);
                rtw_write32(padapter, REG_TXDMA_STATUS, txdma_status);
-               rtl8188e_silentreset_for_specific_platform(padapter);
        }
        /* total xmit irp = 4 */
        current_time = jiffies;
@@ -32,15 +27,8 @@ void rtl8188e_sreset_xmit_status_check(struct adapter *padapter)
                diff_time = jiffies_to_msecs(current_time - psrtpriv->last_tx_time);
 
                if (diff_time > 2000) {
-                       if (psrtpriv->last_tx_complete_time == 0) {
+                       if (psrtpriv->last_tx_complete_time == 0)
                                psrtpriv->last_tx_complete_time = current_time;
-                       } else {
-                               diff_time = jiffies_to_msecs(current_time - psrtpriv->last_tx_complete_time);
-                               if (diff_time > 4000) {
-                                       DBG_88E("%s tx hang\n", __func__);
-                                       rtl8188e_silentreset_for_specific_platform(padapter);
-                               }
-                       }
                }
        }
 }

diff --git a/drivers/staging/r8188eu/include/rtl8188e_sreset.h b/drivers/staging/r8188eu/include/rtl8188e_sreset.h
index 880c5792d5ddf3efc43274f6e1db0cfb304f0173..5d7fec78a27b88b795416a9b1c48e973d01d7fa2 100644 (file)
--- a/drivers/staging/r8188eu/include/rtl8188e_sreset.h
+++ b/drivers/staging/r8188eu/include/rtl8188e_sreset.h
@@ -8,7 +8,6 @@
 #include "drv_types.h"
 #include "rtw_sreset.h"
 
-void rtl8188e_silentreset_for_specific_platform(struct adapter *padapter);
 void rtl8188e_sreset_xmit_status_check(struct adapter *padapter);
 void rtl8188e_sreset_linked_status_check(struct adapter *padapter);
 

diff --git a/drivers/staging/r8188eu/os_dep/ioctl_linux.c b/drivers/staging/r8188eu/os_dep/ioctl_linux.c
index dd47098ed1e5d9abd405312b934740dde322d9f9..78c260d8372520f948fc0b2742f4b20ef2672d4a 100644 (file)
--- a/drivers/staging/r8188eu/os_dep/ioctl_linux.c
+++ b/drivers/staging/r8188eu/os_dep/ioctl_linux.c
@@ -4002,12 +4002,6 @@ static int rtw_dbg_port(struct net_device *dev,
                                SetHalDefVar8188EUsb(padapter, HAL_DEF_DBG_DUMP_TXPKT, &extra_arg);
                        }
                        break;
-               case 0x0f:
-                       if (extra_arg == 0) {
-                               DBG_88E("###### silent reset test.......#####\n");
-                               rtl8188e_silentreset_for_specific_platform(padapter);
-                       }
-                       break;
                case 0x15:
                        {
                                struct pwrctrl_priv *pwrpriv = &padapter->pwrctrlpriv;