staging: rtl8723bs: remove unused code blocks conditioned by never set CONFIG_SDIO_TX...

remove conditional code blocks checked by unused
CONFIG_SDIO_TX_TASKLET

cleaning required in TODO file:

find and remove code blocks guarded by never set CONFIG_FOO defines

Signed-off-by: Fabio Aiuto <fabioaiuto83@gmail.com>
Link: https://lore.kernel.org/r/e7f5f364d9f1f6ab271841b203c4de6c82ecfc9f.1615801722.git.fabioaiuto83@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
index c26e5ccab564e481d7a078f50811584daef1fbd3..9bcceb13ca2d2f4ba545a1c8a7743141bf1187c4 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c
@@ -4431,19 +4431,16 @@ u8 GetHalDefVar8723B(struct adapter *padapter, enum HAL_DEF_VARIABLE variable, v
 
 void rtl8723b_start_thread(struct adapter *padapter)
 {
-#ifndef CONFIG_SDIO_TX_TASKLET
        struct xmit_priv *xmitpriv = &padapter->xmitpriv;
 
        xmitpriv->SdioXmitThread = kthread_run(rtl8723bs_xmit_thread, padapter, "RTWHALXT");
        if (IS_ERR(xmitpriv->SdioXmitThread)) {
                RT_TRACE(_module_hal_xmit_c_, _drv_err_, ("%s: start rtl8723bs_xmit_thread FAIL!!\n", __func__));
        }
-#endif
 }
 
 void rtl8723b_stop_thread(struct adapter *padapter)
 {
-#ifndef CONFIG_SDIO_TX_TASKLET
        struct xmit_priv *xmitpriv = &padapter->xmitpriv;
 
        /*  stop xmit_buf_thread */
@@ -4452,5 +4449,4 @@ void rtl8723b_stop_thread(struct adapter *padapter)
                wait_for_completion(&xmitpriv->SdioXmitTerminate);
                xmitpriv->SdioXmitThread = NULL;
        }
-#endif
 }

diff --git a/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c b/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c
index a3bd9c2002c9936c53455e82eb59b379a6167c1d..597cf3a88c518c64c7dbfa403991a9b4f666cc29 100644 (file)
--- a/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c
+++ b/drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c
@@ -124,10 +124,6 @@ free_xmitbuf:
        /* pxmitbuf->priv_data = NULL; */
        rtw_free_xmitbuf(pxmitpriv, pxmitbuf);
 
-#ifdef CONFIG_SDIO_TX_TASKLET
-       tasklet_hi_schedule(&pxmitpriv->xmit_tasklet);
-#endif
-
        return _FAIL;
 }
 
@@ -601,11 +597,7 @@ s32        rtl8723bs_hal_xmitframe_enqueue(
 
                pxmitpriv->tx_drop++;
        } else {
-#ifdef CONFIG_SDIO_TX_TASKLET
-               tasklet_hi_schedule(&pxmitpriv->xmit_tasklet);
-#else
                complete(&pxmitpriv->SdioXmitStart);
-#endif
        }
 
        return err;

diff --git a/drivers/staging/rtl8723bs/include/rtw_xmit.h b/drivers/staging/rtl8723bs/include/rtw_xmit.h
index a6fb8be8c63a2e3fe509bbb64382c317db480a0a..b482821c9af8773a3ed5f16df110272d2dfd4180 100644 (file)
--- a/drivers/staging/rtl8723bs/include/rtw_xmit.h
+++ b/drivers/staging/rtl8723bs/include/rtw_xmit.h
@@ -412,13 +412,9 @@ struct     xmit_priv {
 
        u8 wmm_para_seq[4];/* sequence for wmm ac parameter strength from large to small. it's value is 0->vo, 1->vi, 2->be, 3->bk. */
 
-#ifdef CONFIG_SDIO_TX_TASKLET
-       struct tasklet_struct xmit_tasklet;
-#else
        void *SdioXmitThread;
        struct completion SdioXmitStart;
        struct completion SdioXmitTerminate;
-#endif /* CONFIG_SDIO_TX_TASKLET */
 
        struct __queue free_xmitbuf_queue;
        struct __queue pending_xmitbuf_queue;