staging: rtl8712: Use completions for signaling

r8712_sitesurvey_cmd() uses a variable to notify r8712_SetFilter() that it
has completed operation. There is no sort of assurance that the variable will
actually change and it could cache the value the first time it is read and
then never update it for the whole loop logic.

Use completion variables because they are better suited for the purpose.

This patch fixes the checkpatch.pl warnings like:
CHECK: Avoid CamelCase: <blnEnableRxFF0Filter>
+   u8 blnEnableRxFF0Filter;

Reviewed-by: Fabio M. De Francesco <fmdefrancesco@gmail.com>
Signed-off-by: Sathish Kumar <skumark1902@gmail.com>
Link: https://lore.kernel.org/r/20220323045515.2513-1-skumark1902@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8712/drv_types.h b/drivers/staging/rtl8712/drv_types.h
index a44d04effc8bf8be8f95f867ea8891c57d43c29f..76ac798642bd2b01e36a170061d7f7a7914d6ddb 100644 (file)
--- a/drivers/staging/rtl8712/drv_types.h
+++ b/drivers/staging/rtl8712/drv_types.h
@@ -157,12 +157,11 @@ struct _adapter {
        struct iw_statistics iwstats;
        int pid; /*process id from UI*/
        struct work_struct wk_filter_rx_ff0;
-       u8 blnEnableRxFF0Filter;
-       spinlock_t lock_rx_ff0_filter;
        const struct firmware *fw;
        struct usb_interface *pusb_intf;
        struct mutex mutex_start;
        struct completion rtl8712_fw_ready;
+       struct completion rx_filter_ready;
 };
 
 static inline u8 *myid(struct eeprom_priv *peepriv)

diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c
index acda930722b274518e8f89506525fdc4565a3f19..f5746020a1b730fd43a9b6ac74a73ef5224df1ca 100644 (file)
--- a/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -202,7 +202,7 @@ u8 r8712_sitesurvey_cmd(struct _adapter *padapter,
        mod_timer(&pmlmepriv->scan_to_timer,
                  jiffies + msecs_to_jiffies(SCANNING_TIMEOUT));
        padapter->ledpriv.LedControlHandler(padapter, LED_CTL_SITE_SURVEY);
-       padapter->blnEnableRxFF0Filter = 0;
+       complete(&padapter->rx_filter_ready);
        return _SUCCESS;
 }
 

diff --git a/drivers/staging/rtl8712/usb_intf.c b/drivers/staging/rtl8712/usb_intf.c
index ee4c61f85a076bea93892b4643eae4758576cb6d..8df50e24f2b8c7bf1dd3296b9b33881ffc62ab04 100644 (file)
--- a/drivers/staging/rtl8712/usb_intf.c
+++ b/drivers/staging/rtl8712/usb_intf.c
@@ -568,7 +568,7 @@ static int r871xu_drv_init(struct usb_interface *pusb_intf,
        /* step 6. Load the firmware asynchronously */
        if (rtl871x_load_fw(padapter))
                goto deinit_drv_sw;
-       spin_lock_init(&padapter->lock_rx_ff0_filter);
+       init_completion(&padapter->rx_filter_ready);
        mutex_init(&padapter->mutex_start);
        return 0;
 

diff --git a/drivers/staging/rtl8712/xmit_linux.c b/drivers/staging/rtl8712/xmit_linux.c
index 90d34cf9d2ffd45e41eb433f7d9111fe3121b96e..4a93839bf9474de9e4d4fe699809a5c1195c44b7 100644 (file)
--- a/drivers/staging/rtl8712/xmit_linux.c
+++ b/drivers/staging/rtl8712/xmit_linux.c
@@ -95,18 +95,12 @@ void r8712_SetFilter(struct work_struct *work)
        struct _adapter *adapter = container_of(work, struct _adapter,
                                                wk_filter_rx_ff0);
        u8  oldvalue = 0x00, newvalue = 0x00;
-       unsigned long irqL;
 
        oldvalue = r8712_read8(adapter, 0x117);
        newvalue = oldvalue & 0xfe;
        r8712_write8(adapter, 0x117, newvalue);
 
-       spin_lock_irqsave(&adapter->lock_rx_ff0_filter, irqL);
-       adapter->blnEnableRxFF0Filter = 1;
-       spin_unlock_irqrestore(&adapter->lock_rx_ff0_filter, irqL);
-       do {
-               msleep(100);
-       } while (adapter->blnEnableRxFF0Filter == 1);
+       wait_for_completion(&adapter->rx_filter_ready);
        r8712_write8(adapter, 0x117, oldvalue);
 }