From: Felix Fietkau <nbd@nbd.name>
To: linux-wireless@vger.kernel.org
Subject: [PATCH 5/9] mt76: remove swq from struct mt76_sw_queue
Date: Mon, 31 Aug 2020 14:25:54 +0200 [thread overview]
Message-ID: <20200831122558.1388-5-nbd@nbd.name> (raw)
In-Reply-To: <20200831122558.1388-1-nbd@nbd.name>
Since txq selection was moved to mac80211, it is no longer used
Signed-off-by: Felix Fietkau <nbd@nbd.name>
---
drivers/net/wireless/mediatek/mt76/mt76.h | 1 -
drivers/net/wireless/mediatek/mt76/mt7603/dma.c | 1 -
drivers/net/wireless/mediatek/mt76/mt7615/dma.c | 2 --
drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c | 1 -
drivers/net/wireless/mediatek/mt76/mt7915/dma.c | 2 --
drivers/net/wireless/mediatek/mt76/sdio.c | 2 --
drivers/net/wireless/mediatek/mt76/usb.c | 2 --
7 files changed, 11 deletions(-)
diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h
index 6f4ced53284c..6cb69e87e8a7 100644
--- 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 a08b85281170..fd54062f0517 100644
--- 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 abb83d4e7712..5f0469b56a1a 100644
--- 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 cfa3430110d8..a0a48c2160a9 100644
--- 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 477d125ec5df..0904b94c90ff 100644
--- 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 326d9c59e8b5..e41037ac0867 100644
--- 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 730d17393c3f..14b93a0ef534 100644
--- 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;
--
2.28.0
next prev parent reply other threads:[~2020-08-31 12:26 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-31 12:25 [PATCH 1/9] mt76: usb: fix use of q->head and q->tail Felix Fietkau
2020-08-31 12:25 ` [PATCH 2/9] mt76: sdio: " Felix Fietkau
2020-08-31 12:25 ` [PATCH 3/9] mt76: unify queue tx cleanup code Felix Fietkau
2020-08-31 12:25 ` [PATCH 4/9] mt76: remove qid argument to drv->tx_complete_skb Felix Fietkau
2020-08-31 12:25 ` Felix Fietkau [this message]
2020-08-31 12:25 ` [PATCH 6/9] mt76: rely on AQL for burst size limits on tx queueing Felix Fietkau
2020-08-31 13:11 ` Toke Høiland-Jørgensen
2020-08-31 12:25 ` [PATCH 7/9] mt76: remove struct mt76_sw_queue Felix Fietkau
2020-08-31 12:25 ` [PATCH 8/9] mt76: mt7603: tune tx ring size Felix Fietkau
2020-08-31 12:25 ` [PATCH 9/9] mt76: mt76x02: " Felix Fietkau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200831122558.1388-5-nbd@nbd.name \
--to=nbd@nbd.name \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).