staging: r8188eu: remove last_tx_complete_time

last_tx_complete_time from struct sreset_priv is set / calculated when a
packet is sent out. Like other sreset_priv components, it is not read and
can be removed.

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

diff --git a/drivers/staging/r8188eu/core/rtw_sreset.c b/drivers/staging/r8188eu/core/rtw_sreset.c
index bf436a653c71ab70f14afbf64523728c9c481b01..1df46673bddd7c28aacbdc63e1e0782183e028dc 100644 (file)
--- a/drivers/staging/r8188eu/core/rtw_sreset.c
+++ b/drivers/staging/r8188eu/core/rtw_sreset.c
@@ -9,7 +9,6 @@ void sreset_init_value(struct adapter *padapter)
        struct sreset_priv *psrtpriv = &pHalData->srestpriv;
 
        psrtpriv->last_tx_time = 0;
-       psrtpriv->last_tx_complete_time = 0;
 }
 void sreset_reset_value(struct adapter *padapter)
 {
@@ -17,5 +16,4 @@ void sreset_reset_value(struct adapter *padapter)
        struct sreset_priv *psrtpriv = &pHalData->srestpriv;
 
        psrtpriv->last_tx_time = 0;
-       psrtpriv->last_tx_complete_time = 0;
 }

diff --git a/drivers/staging/r8188eu/hal/rtl8188e_sreset.c b/drivers/staging/r8188eu/hal/rtl8188e_sreset.c
index ea793fef6f10d294f2db65f978ea962fb1f4758b..7b3ac6e306ced36a66338fdb472f845435a219ad 100644 (file)
--- a/drivers/staging/r8188eu/hal/rtl8188e_sreset.c
+++ b/drivers/staging/r8188eu/hal/rtl8188e_sreset.c
@@ -8,12 +8,6 @@
 
 void rtl8188e_sreset_xmit_status_check(struct adapter *padapter)
 {
-       struct hal_data_8188e   *pHalData = GET_HAL_DATA(padapter);
-       struct sreset_priv *psrtpriv = &pHalData->srestpriv;
-
-       unsigned long current_time;
-       struct xmit_priv        *pxmitpriv = &padapter->xmitpriv;
-       unsigned int diff_time;
        u32 txdma_status;
 
        txdma_status = rtw_read32(padapter, REG_TXDMA_STATUS);
@@ -22,15 +16,6 @@ void rtl8188e_sreset_xmit_status_check(struct adapter *padapter)
                rtw_write32(padapter, REG_TXDMA_STATUS, txdma_status);
        }
        /* total xmit irp = 4 */
-       current_time = jiffies;
-       if (0 == pxmitpriv->free_xmitbuf_cnt) {
-               diff_time = jiffies_to_msecs(current_time - psrtpriv->last_tx_time);
-
-               if (diff_time > 2000) {
-                       if (psrtpriv->last_tx_complete_time == 0)
-                               psrtpriv->last_tx_complete_time = current_time;
-               }
-       }
 }
 
 void rtl8188e_sreset_linked_status_check(struct adapter *padapter)

diff --git a/drivers/staging/r8188eu/include/rtw_sreset.h b/drivers/staging/r8188eu/include/rtw_sreset.h
index f404cbd54f9fabbed7478fceed0c3886387f1f1a..ff84cdc02c2c04bc97fa5a52ef61d3bc2cd53b8a 100644 (file)
--- a/drivers/staging/r8188eu/include/rtw_sreset.h
+++ b/drivers/staging/r8188eu/include/rtw_sreset.h
@@ -9,7 +9,6 @@
 
 struct sreset_priv {
        unsigned long last_tx_time;
-       unsigned long last_tx_complete_time;
 };
 
 #include "rtl8188e_hal.h"

diff --git a/drivers/staging/r8188eu/os_dep/usb_ops_linux.c b/drivers/staging/r8188eu/os_dep/usb_ops_linux.c
index 966fba50f73d376103bbb1b73325d6afb182454e..57a435138bf01b084d81169106576c36b7d67a0c 100644 (file)
--- a/drivers/staging/r8188eu/os_dep/usb_ops_linux.c
+++ b/drivers/staging/r8188eu/os_dep/usb_ops_linux.c
@@ -53,7 +53,6 @@ static void usb_write_port_complete(struct urb *purb, struct pt_regs *regs)
        struct xmit_buf *pxmitbuf = (struct xmit_buf *)purb->context;
        struct adapter  *padapter = pxmitbuf->padapter;
        struct xmit_priv        *pxmitpriv = &padapter->xmitpriv;
-       struct hal_data_8188e   *haldata;
 
        switch (pxmitbuf->flags) {
        case VO_QUEUE_INX:
@@ -106,9 +105,6 @@ static void usb_write_port_complete(struct urb *purb, struct pt_regs *regs)
                }
        }
 
-       haldata = GET_HAL_DATA(padapter);
-       haldata->srestpriv.last_tx_complete_time = jiffies;
-
 check_completion:
        rtw_sctx_done_err(&pxmitbuf->sctx,
                          purb->status ? RTW_SCTX_DONE_WRITE_PORT_ERR :