staging: wfx: drop useless link_map_cache

Driver does not use link_map_cache anymore. So we can drop it. In add,
we do not have to keep this counter in sync with skb_queue item, so we
can drop explicit spin_locks.

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-16-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 6fa8f4e083d3c5b8885609173e6662e88ff79292..82c2781b1f7880c08a2cf33e50ab6aef3ec0ea43 100644 (file)
--- a/drivers/staging/wfx/queue.c
+++ b/drivers/staging/wfx/queue.c
@@ -94,20 +94,10 @@ void wfx_tx_queues_wait_empty_vif(struct wfx_vif *wvif)
 static void wfx_tx_queue_clear(struct wfx_dev *wdev, struct wfx_queue *queue,
                               struct sk_buff_head *gc_list)
 {
-       int i;
        struct sk_buff *item;
-       struct wfx_queue_stats *stats = &wdev->tx_queue_stats;
 
-       spin_lock_bh(&queue->queue.lock);
-       while ((item = __skb_dequeue(&queue->queue)) != NULL)
+       while ((item = skb_dequeue(&queue->queue)) != NULL)
                skb_queue_head(gc_list, item);
-       spin_lock_nested(&stats->pending.lock, 1);
-       for (i = 0; i < ARRAY_SIZE(stats->link_map_cache); ++i) {
-               stats->link_map_cache[i] -= queue->link_map_cache[i];
-               queue->link_map_cache[i] = 0;
-       }
-       spin_unlock(&stats->pending.lock);
-       spin_unlock_bh(&queue->queue.lock);
 }
 
 void wfx_tx_queues_clear(struct wfx_dev *wdev)
@@ -163,28 +153,15 @@ int wfx_tx_queue_get_num_queued(struct wfx_queue *queue)
 void wfx_tx_queue_put(struct wfx_dev *wdev, struct wfx_queue *queue,
                      struct sk_buff *skb)
 {
-       struct wfx_queue_stats *stats = &wdev->tx_queue_stats;
-       struct wfx_tx_priv *tx_priv = wfx_skb_tx_priv(skb);
-
-       WARN(tx_priv->link_id >= ARRAY_SIZE(stats->link_map_cache), "invalid link-id value");
-       spin_lock_bh(&queue->queue.lock);
-       __skb_queue_tail(&queue->queue, skb);
-
-       ++queue->link_map_cache[tx_priv->link_id];
-
-       spin_lock_nested(&stats->pending.lock, 1);
-       ++stats->link_map_cache[tx_priv->link_id];
-       spin_unlock(&stats->pending.lock);
-       spin_unlock_bh(&queue->queue.lock);
+       skb_queue_tail(&queue->queue, skb);
 }
 
 static struct sk_buff *wfx_tx_queue_get(struct wfx_dev *wdev,
                                        struct wfx_queue *queue,
                                        u32 link_id_map)
 {
-       struct sk_buff *skb = NULL;
-       struct sk_buff *item;
        struct wfx_queue_stats *stats = &wdev->tx_queue_stats;
+       struct sk_buff *item, *skb = NULL;
        struct wfx_tx_priv *tx_priv;
 
        spin_lock_bh(&queue->queue.lock);
@@ -195,39 +172,28 @@ static struct sk_buff *wfx_tx_queue_get(struct wfx_dev *wdev,
                        break;
                }
        }
+       spin_unlock_bh(&queue->queue.lock);
        if (skb) {
+               skb_unlink(skb, &queue->queue);
                tx_priv = wfx_skb_tx_priv(skb);
                tx_priv->xmit_timestamp = ktime_get();
-               __skb_unlink(skb, &queue->queue);
-               --queue->link_map_cache[tx_priv->link_id];
-
-               spin_lock_nested(&stats->pending.lock, 1);
-               __skb_queue_tail(&stats->pending, skb);
-               --stats->link_map_cache[tx_priv->link_id];
-               spin_unlock(&stats->pending.lock);
+               skb_queue_tail(&stats->pending, skb);
+               if (skb_queue_empty(&queue->queue))
+                       wake_up(&stats->wait_link_id_empty);
+               return skb;
        }
-       spin_unlock_bh(&queue->queue.lock);
-       if (skb_queue_empty(&queue->queue))
-               wake_up(&stats->wait_link_id_empty);
        return skb;
 }
 
 int wfx_pending_requeue(struct wfx_dev *wdev, struct sk_buff *skb)
 {
        struct wfx_queue_stats *stats = &wdev->tx_queue_stats;
-       struct wfx_tx_priv *tx_priv = wfx_skb_tx_priv(skb);
        struct wfx_queue *queue = &wdev->tx_queue[skb_get_queue_mapping(skb)];
 
        WARN_ON(skb_get_queue_mapping(skb) > 3);
-       spin_lock_bh(&queue->queue.lock);
-       ++queue->link_map_cache[tx_priv->link_id];
 
-       spin_lock_nested(&stats->pending.lock, 1);
-       ++stats->link_map_cache[tx_priv->link_id];
-       __skb_unlink(skb, &stats->pending);
-       spin_unlock(&stats->pending.lock);
-       __skb_queue_tail(&queue->queue, skb);
-       spin_unlock_bh(&queue->queue.lock);
+       skb_unlink(skb, &stats->pending);
+       skb_queue_tail(&queue->queue, skb);
        return 0;
 }
 
@@ -235,9 +201,7 @@ int wfx_pending_remove(struct wfx_dev *wdev, struct sk_buff *skb)
 {
        struct wfx_queue_stats *stats = &wdev->tx_queue_stats;
 
-       spin_lock_bh(&stats->pending.lock);
-       __skb_unlink(skb, &stats->pending);
-       spin_unlock_bh(&stats->pending.lock);
+       skb_unlink(skb, &stats->pending);
        wfx_skb_dtor(wdev, skb);
 
        return 0;

diff --git a/drivers/staging/wfx/queue.h b/drivers/staging/wfx/queue.h
index 58da216d47dd77e7e201029a162ef35794079849..dd141cb4bf6342b6b2ace4ea1415e3d1114c564c 100644 (file)
--- a/drivers/staging/wfx/queue.h
+++ b/drivers/staging/wfx/queue.h
@@ -16,18 +16,15 @@
 #define WFX_LINK_ID_NO_ASSOC      15
 #define WFX_LINK_ID_AFTER_DTIM    (WFX_LINK_ID_NO_ASSOC + 1)
 #define WFX_LINK_ID_UAPSD         (WFX_LINK_ID_NO_ASSOC + 2)
-#define WFX_LINK_ID_MAX           (WFX_LINK_ID_NO_ASSOC + 3)
 
 struct wfx_dev;
 struct wfx_vif;
 
 struct wfx_queue {
        struct sk_buff_head     queue;
-       int                     link_map_cache[WFX_LINK_ID_MAX];
 };
 
 struct wfx_queue_stats {
-       int                     link_map_cache[WFX_LINK_ID_MAX];
        struct sk_buff_head     pending;
        wait_queue_head_t       wait_link_id_empty;
 };