From 05aa857861fcde9d32afb14678fee2fe01702fe4 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@nbd.name>
Date: Sun, 23 Aug 2020 18:21:18 +0200
Subject: [PATCH] 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>
---
 mt76.h         | 1 -
 mt7603/dma.c   | 1 -
 mt7615/dma.c   | 2 --
 mt76x02_mmio.c | 1 -
 mt7915/dma.c   | 2 --
 sdio.c         | 2 --
 usb.c          | 2 --
 7 files changed, 11 deletions(-)

diff --git a/mt76.h b/mt76.h
index b81b849f..0c3cb7fa 100644
--- a/mt76.h
+++ b/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/mt7603/dma.c b/mt7603/dma.c
index 9ec86da9..3d791453 100644
--- a/mt7603/dma.c
+++ b/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/mt7615/dma.c b/mt7615/dma.c
index f5c2b08e..8743a055 100644
--- a/mt7615/dma.c
+++ b/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/mt76x02_mmio.c b/mt76x02_mmio.c
index 156fed61..fc166296 100644
--- a/mt76x02_mmio.c
+++ b/mt76x02_mmio.c
@@ -117,7 +117,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/mt7915/dma.c b/mt7915/dma.c
index b58b3cc8..3dec15b9 100644
--- a/mt7915/dma.c
+++ b/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/sdio.c b/sdio.c
index 326d9c59..e41037ac 100644
--- a/sdio.c
+++ b/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/usb.c b/usb.c
index c3dd36ac..df6628b5 100644
--- a/usb.c
+++ b/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;