staging: wfx: drop struct wfx_queue_stats

There is no reason to keep the intermediate struct wfx_queue_stats.
Relocate its members to struct wfx_dev.

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-25-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 b45fb837f1cd747ac54e3178d9df10ce012bcfbb..a03860db2f5426f715ecbdd857e4c92f15ec09f0 100644 (file)
--- a/drivers/staging/wfx/queue.c
+++ b/drivers/staging/wfx/queue.c
@@ -121,12 +121,11 @@ void wfx_tx_queues_clear(struct wfx_dev *wdev)
        int i;
        struct sk_buff *item;
        struct sk_buff_head gc_list;
-       struct wfx_queue_stats *stats = &wdev->tx_queue_stats;
 
        skb_queue_head_init(&gc_list);
        for (i = 0; i < IEEE80211_NUM_ACS; ++i)
                wfx_tx_queue_clear(wdev, &wdev->tx_queue[i], &gc_list);
-       wake_up(&stats->wait_link_id_empty);
+       wake_up(&wdev->tx_dequeue);
        while ((item = skb_dequeue(&gc_list)) != NULL)
                wfx_skb_dtor(wdev, item);
 }
@@ -135,10 +134,9 @@ void wfx_tx_queues_init(struct wfx_dev *wdev)
 {
        int i;
 
-       memset(&wdev->tx_queue_stats, 0, sizeof(wdev->tx_queue_stats));
        memset(wdev->tx_queue, 0, sizeof(wdev->tx_queue));
-       skb_queue_head_init(&wdev->tx_queue_stats.pending);
-       init_waitqueue_head(&wdev->tx_queue_stats.wait_link_id_empty);
+       skb_queue_head_init(&wdev->tx_pending);
+       init_waitqueue_head(&wdev->tx_dequeue);
 
        for (i = 0; i < IEEE80211_NUM_ACS; ++i) {
                skb_queue_head_init(&wdev->tx_queue[i].normal);
@@ -148,7 +146,7 @@ void wfx_tx_queues_init(struct wfx_dev *wdev)
 
 void wfx_tx_queues_deinit(struct wfx_dev *wdev)
 {
-       WARN_ON(!skb_queue_empty(&wdev->tx_queue_stats.pending));
+       WARN_ON(!skb_queue_empty(&wdev->tx_pending));
        wfx_tx_queues_clear(wdev);
 }
 
@@ -165,28 +163,26 @@ void wfx_tx_queue_put(struct wfx_dev *wdev, struct wfx_queue *queue,
 
 int wfx_pending_requeue(struct wfx_dev *wdev, struct sk_buff *skb)
 {
-       struct wfx_queue_stats *stats = &wdev->tx_queue_stats;
        struct wfx_queue *queue = &wdev->tx_queue[skb_get_queue_mapping(skb)];
 
        WARN_ON(skb_get_queue_mapping(skb) > 3);
        WARN_ON(!atomic_read(&queue->pending_frames));
 
        atomic_dec(&queue->pending_frames);
-       skb_unlink(skb, &stats->pending);
+       skb_unlink(skb, &wdev->tx_pending);
        wfx_tx_queue_put(wdev, queue, skb);
        return 0;
 }
 
 int wfx_pending_remove(struct wfx_dev *wdev, struct sk_buff *skb)
 {
-       struct wfx_queue_stats *stats = &wdev->tx_queue_stats;
        struct wfx_queue *queue = &wdev->tx_queue[skb_get_queue_mapping(skb)];
 
        WARN_ON(skb_get_queue_mapping(skb) > 3);
        WARN_ON(!atomic_read(&queue->pending_frames));
 
        atomic_dec(&queue->pending_frames);
-       skb_unlink(skb, &stats->pending);
+       skb_unlink(skb, &wdev->tx_pending);
        wfx_skb_dtor(wdev, skb);
 
        return 0;
@@ -196,32 +192,30 @@ struct sk_buff *wfx_pending_get(struct wfx_dev *wdev, u32 packet_id)
 {
        struct sk_buff *skb;
        struct hif_req_tx *req;
-       struct wfx_queue_stats *stats = &wdev->tx_queue_stats;
 
-       spin_lock_bh(&stats->pending.lock);
-       skb_queue_walk(&stats->pending, skb) {
+       spin_lock_bh(&wdev->tx_pending.lock);
+       skb_queue_walk(&wdev->tx_pending, skb) {
                req = wfx_skb_txreq(skb);
                if (req->packet_id == packet_id) {
-                       spin_unlock_bh(&stats->pending.lock);
+                       spin_unlock_bh(&wdev->tx_pending.lock);
                        return skb;
                }
        }
-       spin_unlock_bh(&stats->pending.lock);
+       spin_unlock_bh(&wdev->tx_pending.lock);
        WARN(1, "cannot find packet in pending queue");
        return NULL;
 }
 
 void wfx_pending_dump_old_frames(struct wfx_dev *wdev, unsigned int limit_ms)
 {
-       struct wfx_queue_stats *stats = &wdev->tx_queue_stats;
        ktime_t now = ktime_get();
        struct wfx_tx_priv *tx_priv;
        struct hif_req_tx *req;
        struct sk_buff *skb;
        bool first = true;
 
-       spin_lock_bh(&stats->pending.lock);
-       skb_queue_walk(&stats->pending, skb) {
+       spin_lock_bh(&wdev->tx_pending.lock);
+       skb_queue_walk(&wdev->tx_pending, skb) {
                tx_priv = wfx_skb_tx_priv(skb);
                req = wfx_skb_txreq(skb);
                if (ktime_after(now, ktime_add_ms(tx_priv->xmit_timestamp,
@@ -236,7 +230,7 @@ void wfx_pending_dump_old_frames(struct wfx_dev *wdev, unsigned int limit_ms)
                                 ktime_ms_delta(now, tx_priv->xmit_timestamp));
                }
        }
-       spin_unlock_bh(&stats->pending.lock);
+       spin_unlock_bh(&wdev->tx_pending.lock);
 }
 
 unsigned int wfx_pending_get_pkt_us_delay(struct wfx_dev *wdev,
@@ -377,9 +371,9 @@ struct hif_msg *wfx_tx_queues_get(struct wfx_dev *wdev)
                skb = wfx_tx_queues_get_skb(wdev);
                if (!skb)
                        return NULL;
-               skb_queue_tail(&wdev->tx_queue_stats.pending, skb);
+               skb_queue_tail(&wdev->tx_pending, skb);
                if (wfx_tx_queues_empty(wdev))
-                       wake_up(&wdev->tx_queue_stats.wait_link_id_empty);
+                       wake_up(&wdev->tx_dequeue);
                // FIXME: is it useful?
                if (wfx_handle_tx_data(wdev, skb))
                        continue;

diff --git a/drivers/staging/wfx/queue.h b/drivers/staging/wfx/queue.h
index 8e99bb2792ede28810a298f8a1c7e3b8abac0a98..241ca3039b54cb9f5bdc57280ed24d9c651f9aba 100644 (file)
--- a/drivers/staging/wfx/queue.h
+++ b/drivers/staging/wfx/queue.h
@@ -25,11 +25,6 @@ struct wfx_queue {
        atomic_t                pending_frames;
 };
 
-struct wfx_queue_stats {
-       struct sk_buff_head     pending;
-       wait_queue_head_t       wait_link_id_empty;
-};
-
 void wfx_tx_lock(struct wfx_dev *wdev);
 void wfx_tx_unlock(struct wfx_dev *wdev);
 void wfx_tx_flush(struct wfx_dev *wdev);

diff --git a/drivers/staging/wfx/sta.c b/drivers/staging/wfx/sta.c
index 15f00ea840684dd219fd47d3502336259324a3d5..340e09bb639d0ead76f1e03e571caadea138b3ca 100644 (file)
--- a/drivers/staging/wfx/sta.c
+++ b/drivers/staging/wfx/sta.c
@@ -323,7 +323,7 @@ static int __wfx_flush(struct wfx_dev *wdev, bool drop)
        for (;;) {
                if (drop)
                        wfx_tx_queues_clear(wdev);
-               if (wait_event_timeout(wdev->tx_queue_stats.wait_link_id_empty,
+               if (wait_event_timeout(wdev->tx_dequeue,
                                       wfx_tx_queues_empty(wdev),
                                       2 * HZ) <= 0)
                        return -ETIMEDOUT;

diff --git a/drivers/staging/wfx/wfx.h b/drivers/staging/wfx/wfx.h
index 6b5b95a45e60bffb350414971e14cd23c8e9cff9..af4c93af81bea0d94c05b7433593d9fb385892ce 100644 (file)
--- a/drivers/staging/wfx/wfx.h
+++ b/drivers/staging/wfx/wfx.h
@@ -50,7 +50,8 @@ struct wfx_dev {
 
        struct wfx_hif_cmd      hif_cmd;
        struct wfx_queue        tx_queue[4];
-       struct wfx_queue_stats  tx_queue_stats;
+       struct sk_buff_head     tx_pending;
+       wait_queue_head_t       tx_dequeue;
        atomic_t                tx_lock;
 
        atomic_t                packet_id;