mt76: usb: rely on mt76_for_each_q_rx

Rely on mt76_for_each_q_rx whenever possible in order to simply the code

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/debugfs.c b/drivers/net/wireless/mediatek/mt76/debugfs.c
index 3a5de1d1b12121d4d08109e75dfa7d695c7cbb39..9fda65db8cac61a7d3139beda9fb07a40651d736 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/debugfs.c
+++ b/drivers/net/wireless/mediatek/mt76/debugfs.c
@@ -54,9 +54,6 @@ static int mt76_rx_queues_read(struct seq_file *s, void *data)
        mt76_for_each_q_rx(dev, i) {
                struct mt76_queue *q = &dev->q_rx[i];
 
-               if (!q->ndesc)
-                       continue;
-
                queued = mt76_is_usb(dev) ? q->ndesc - q->queued : q->queued;
                seq_printf(s, "%d:      queued=%d head=%d tail=%d\n",
                           i, queued, q->head, q->tail);

diff --git a/drivers/net/wireless/mediatek/mt76/usb.c b/drivers/net/wireless/mediatek/mt76/usb.c
index 27abcdb61a064fae5ebbac1197d8c13e8642a7ce..0ff3096f7455a3c9a4973340aeb0e00bec4854b8 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/usb.c
+++ b/drivers/net/wireless/mediatek/mt76/usb.c
@@ -672,17 +672,11 @@ mt76u_process_rx_queue(struct mt76_dev *dev, struct mt76_queue *q)
 static void mt76u_rx_tasklet(unsigned long data)
 {
        struct mt76_dev *dev = (struct mt76_dev *)data;
-       struct mt76_queue *q;
        int i;
 
        rcu_read_lock();
-       for (i = 0; i < __MT_RXQ_MAX; i++) {
-               q = &dev->q_rx[i];
-               if (!q->ndesc)
-                       continue;
-
-               mt76u_process_rx_queue(dev, q);
-       }
+       mt76_for_each_q_rx(dev, i)
+               mt76u_process_rx_queue(dev, &dev->q_rx[i]);
        rcu_read_unlock();
 }
 
@@ -756,27 +750,19 @@ mt76u_free_rx_queue(struct mt76_dev *dev, struct mt76_queue *q)
 
 static void mt76u_free_rx(struct mt76_dev *dev)
 {
-       struct mt76_queue *q;
        int i;
 
-       for (i = 0; i < __MT_RXQ_MAX; i++) {
-               q = &dev->q_rx[i];
-               if (!q->ndesc)
-                       continue;
-
-               mt76u_free_rx_queue(dev, q);
-       }
+       mt76_for_each_q_rx(dev, i)
+               mt76u_free_rx_queue(dev, &dev->q_rx[i]);
 }
 
 void mt76u_stop_rx(struct mt76_dev *dev)
 {
-       struct mt76_queue *q;
-       int i, j;
+       int i;
 
-       for (i = 0; i < __MT_RXQ_MAX; i++) {
-               q = &dev->q_rx[i];
-               if (!q->ndesc)
-                       continue;
+       mt76_for_each_q_rx(dev, i) {
+               struct mt76_queue *q = &dev->q_rx[i];
+               int j;
 
                for (j = 0; j < q->ndesc; j++)
                        usb_poison_urb(q->entry[j].urb);
@@ -788,14 +774,11 @@ EXPORT_SYMBOL_GPL(mt76u_stop_rx);
 
 int mt76u_resume_rx(struct mt76_dev *dev)
 {
-       struct mt76_queue *q;
-       int i, j, err;
-
-       for (i = 0; i < __MT_RXQ_MAX; i++) {
-               q = &dev->q_rx[i];
+       int i;
 
-               if (!q->ndesc)
-                       continue;
+       mt76_for_each_q_rx(dev, i) {
+               struct mt76_queue *q = &dev->q_rx[i];
+               int err, j;
 
                for (j = 0; j < q->ndesc; j++)
                        usb_unpoison_urb(q->entry[j].urb);