staging: wfx: simplify wfx_tx_queues_empty()

Thanks to skb_queue_empty_lockless(), it is not necessary to acquire the
spin_lock before to check if the queue is empty.

Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
Link: https://lore.kernel.org/r/20200401110405.80282-10-Jerome.Pouiller@silabs.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wfx/queue.c b/drivers/staging/wfx/queue.c
index 8647731e02c09e942ef3c199e8f348c9ced5db13..09f823929fb6a4e7f5651307920cabce22fb9ab4 100644 (file)
--- a/drivers/staging/wfx/queue.c
+++ b/drivers/staging/wfx/queue.c
@@ -303,20 +303,14 @@ unsigned int wfx_pending_get_pkt_us_delay(struct wfx_dev *wdev,
        return ktime_us_delta(now, tx_priv->xmit_timestamp);
 }
 
-bool wfx_tx_queues_is_empty(struct wfx_dev *wdev)
+bool wfx_tx_queues_empty(struct wfx_dev *wdev)
 {
        int i;
-       struct sk_buff_head *queue;
-       bool ret = true;
-
-       for (i = 0; i < IEEE80211_NUM_ACS; i++) {
-               queue = &wdev->tx_queue[i].queue;
-               spin_lock_bh(&queue->lock);
-               if (!skb_queue_empty(queue))
-                       ret = false;
-               spin_unlock_bh(&queue->lock);
-       }
-       return ret;
+
+       for (i = 0; i < IEEE80211_NUM_ACS; i++)
+               if (!skb_queue_empty_lockless(&wdev->tx_queue[i].queue))
+                       return false;
+       return true;
 }
 
 static bool wfx_handle_tx_data(struct wfx_dev *wdev, struct sk_buff *skb)

diff --git a/drivers/staging/wfx/queue.h b/drivers/staging/wfx/queue.h
index 2284fa64b625acd943a8254dc0521f961d226dc4..5a5aa38dbb2f4209aa52d150126bd1144eddac66 100644 (file)
--- a/drivers/staging/wfx/queue.h
+++ b/drivers/staging/wfx/queue.h
@@ -40,7 +40,7 @@ void wfx_tx_lock_flush(struct wfx_dev *wdev);
 void wfx_tx_queues_init(struct wfx_dev *wdev);
 void wfx_tx_queues_deinit(struct wfx_dev *wdev);
 void wfx_tx_queues_clear(struct wfx_dev *wdev);
-bool wfx_tx_queues_is_empty(struct wfx_dev *wdev);
+bool wfx_tx_queues_empty(struct wfx_dev *wdev);
 void wfx_tx_queues_wait_empty_vif(struct wfx_vif *wvif);
 struct hif_msg *wfx_tx_queues_get(struct wfx_dev *wdev);
 struct hif_msg *wfx_tx_queues_get_after_dtim(struct wfx_vif *wvif);

diff --git a/drivers/staging/wfx/sta.c b/drivers/staging/wfx/sta.c
index a275330f551800d14ec9085611dd8d583a10b2ed..be493b5f2b5da5aa697587ba992bb1f576dd541c 100644 (file)
--- a/drivers/staging/wfx/sta.c
+++ b/drivers/staging/wfx/sta.c
@@ -325,11 +325,11 @@ static int __wfx_flush(struct wfx_dev *wdev, bool drop)
                if (drop)
                        wfx_tx_queues_clear(wdev);
                if (wait_event_timeout(wdev->tx_queue_stats.wait_link_id_empty,
-                                      wfx_tx_queues_is_empty(wdev),
+                                      wfx_tx_queues_empty(wdev),
                                       2 * HZ) <= 0)
                        return -ETIMEDOUT;
                wfx_tx_flush(wdev);
-               if (wfx_tx_queues_is_empty(wdev))
+               if (wfx_tx_queues_empty(wdev))
                        return 0;
                dev_warn(wdev->dev, "frames queued while flushing tx queues");
        }