mt76: remove swq from struct mt76_sw_queue

Since txq selection was moved to mac80211, it is no longer used

Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h
index 6f4ced5..6cb69e8 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76.h
@@ -140,7 +140,6 @@ struct mt76_queue {
 struct mt76_sw_queue {
        struct mt76_queue *q;
 
-       struct list_head swq;
        int swq_queued;
 };
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/dma.c b/drivers/net/wireless/mediatek/mt76/mt7603/dma.c
index a08b852..fd54062 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7603/dma.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7603/dma.c
@@ -19,7 +19,6 @@ mt7603_init_tx_queue(struct mt7603_dev *dev, struct mt76_sw_queue *q,
        if (err < 0)
                return err;
 
-       INIT_LIST_HEAD(&q->swq);
        q->q = hwq;
 
        mt7603_irq_enable(dev, MT_INT_TX_DONE(idx));

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/dma.c b/drivers/net/wireless/mediatek/mt76/mt7615/dma.c
index abb83d4..5f0469b 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/dma.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/dma.c
@@ -26,7 +26,6 @@ mt7615_init_tx_queue(struct mt7615_dev *dev, struct mt76_sw_queue *q,
        if (err < 0)
                return err;
 
-       INIT_LIST_HEAD(&q->swq);
        q->q = hwq;
 
        return 0;
@@ -84,7 +83,6 @@ mt7615_init_tx_queues(struct mt7615_dev *dev)
 
        for (i = 1; i < MT_TXQ_MCU; i++) {
                q = &dev->mt76.q_tx[i];
-               INIT_LIST_HEAD(&q->swq);
                q->q = dev->mt76.q_tx[0].q;
        }
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c b/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c
index cfa3430..a0a48c2 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c
@@ -118,7 +118,6 @@ mt76x02_init_tx_queue(struct mt76x02_dev *dev, struct mt76_sw_queue *q,
        if (err < 0)
                return err;
 
-       INIT_LIST_HEAD(&q->swq);
        q->q = hwq;
 
        mt76x02_irq_enable(dev, MT_INT_TX_DONE(idx));

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/dma.c b/drivers/net/wireless/mediatek/mt76/mt7915/dma.c
index 477d125..0904b94 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/dma.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/dma.c
@@ -23,7 +23,6 @@ mt7915_init_tx_queues(struct mt7915_dev *dev, int n_desc)
 
        for (i = 0; i < MT_TXQ_MCU; i++) {
                q = &dev->mt76.q_tx[i];
-               INIT_LIST_HEAD(&q->swq);
                q->q = hwq;
        }
 
@@ -45,7 +44,6 @@ mt7915_init_mcu_queue(struct mt7915_dev *dev, struct mt76_sw_queue *q,
        if (err < 0)
                return err;
 
-       INIT_LIST_HEAD(&q->swq);
        q->q = hwq;
 
        return 0;

diff --git a/drivers/net/wireless/mediatek/mt76/sdio.c b/drivers/net/wireless/mediatek/mt76/sdio.c
index 326d9c5..e41037a 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/sdio.c
+++ b/drivers/net/wireless/mediatek/mt76/sdio.c
@@ -42,8 +42,6 @@ static int mt76s_alloc_tx(struct mt76_dev *dev)
        int i;
 
        for (i = 0; i < MT_TXQ_MCU_WA; i++) {
-               INIT_LIST_HEAD(&dev->q_tx[i].swq);
-
                q = devm_kzalloc(dev->dev, sizeof(*q), GFP_KERNEL);
                if (!q)
                        return -ENOMEM;

diff --git a/drivers/net/wireless/mediatek/mt76/usb.c b/drivers/net/wireless/mediatek/mt76/usb.c
index 730d173..14b93a0 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/usb.c
+++ b/drivers/net/wireless/mediatek/mt76/usb.c
@@ -972,8 +972,6 @@ static int mt76u_alloc_tx(struct mt76_dev *dev)
        int i, j, err;
 
        for (i = 0; i <= MT_TXQ_PSD; i++) {
-               INIT_LIST_HEAD(&dev->q_tx[i].swq);
-
                if (i >= IEEE80211_NUM_ACS) {
                        dev->q_tx[i].q = dev->q_tx[0].q;
                        continue;