mt76: move mt76_tx_tasklet in mt76 module

Move mt76{15,03}_tx_tasklet in mt76_alloc_device in order to be used as
default tx_tasklet initialization. Remove duplicated code in
mt7603/mt7615 drivers

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

diff --git a/drivers/net/wireless/mediatek/mt76/mac80211.c b/drivers/net/wireless/mediatek/mt76/mac80211.c
index 5814154..2c2196f 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mac80211.c
+++ b/drivers/net/wireless/mediatek/mt76/mac80211.c
@@ -283,6 +283,8 @@ mt76_alloc_device(struct device *pdev, unsigned int size,
        init_waitqueue_head(&dev->tx_wait);
        skb_queue_head_init(&dev->status_list);
 
+       tasklet_init(&dev->tx_tasklet, mt76_tx_tasklet, (unsigned long)dev);
+
        return dev;
 }
 EXPORT_SYMBOL_GPL(mt76_alloc_device);

diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h
index afcd2f2..05cd892 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76.h
@@ -708,6 +708,7 @@ void mt76_stop_tx_queues(struct mt76_dev *dev, struct ieee80211_sta *sta,
                         bool send_bar);
 void mt76_txq_schedule(struct mt76_dev *dev, enum mt76_txq_id qid);
 void mt76_txq_schedule_all(struct mt76_dev *dev);
+void mt76_tx_tasklet(unsigned long data);
 void mt76_release_buffered_frames(struct ieee80211_hw *hw,
                                  struct ieee80211_sta *sta,
                                  u16 tids, int nframes,

diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/dma.c b/drivers/net/wireless/mediatek/mt76/mt7603/dma.c
index 79dc3b9..49f206b 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7603/dma.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7603/dma.c
@@ -135,14 +135,6 @@ mt7603_init_rx_queue(struct mt7603_dev *dev, struct mt76_queue *q,
        return 0;
 }
 
-static void
-mt7603_tx_tasklet(unsigned long data)
-{
-       struct mt7603_dev *dev = (struct mt7603_dev *)data;
-
-       mt76_txq_schedule_all(&dev->mt76);
-}
-
 static int mt7603_poll_tx(struct napi_struct *napi, int budget)
 {
        struct mt7603_dev *dev;
@@ -181,9 +173,6 @@ int mt7603_dma_init(struct mt7603_dev *dev)
        init_waitqueue_head(&dev->mt76.mmio.mcu.wait);
        skb_queue_head_init(&dev->mt76.mmio.mcu.res_q);
 
-       tasklet_init(&dev->mt76.tx_tasklet, mt7603_tx_tasklet,
-                    (unsigned long)dev);
-
        mt76_clear(dev, MT_WPDMA_GLO_CFG,
                   MT_WPDMA_GLO_CFG_TX_DMA_EN |
                   MT_WPDMA_GLO_CFG_RX_DMA_EN |

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/dma.c b/drivers/net/wireless/mediatek/mt76/mt7615/dma.c
index 3fe24d9..fe532ce 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/dma.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/dma.c
@@ -90,13 +90,6 @@ void mt7615_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q,
        }
 }
 
-static void mt7615_tx_tasklet(unsigned long data)
-{
-       struct mt7615_dev *dev = (struct mt7615_dev *)data;
-
-       mt76_txq_schedule_all(&dev->mt76);
-}
-
 static int mt7615_poll_tx(struct napi_struct *napi, int budget)
 {
        static const u8 queue_map[] = {
@@ -128,9 +121,6 @@ int mt7615_dma_init(struct mt7615_dev *dev)
 
        mt76_dma_attach(&dev->mt76);
 
-       tasklet_init(&dev->mt76.tx_tasklet, mt7615_tx_tasklet,
-                    (unsigned long)dev);
-
        mt76_wr(dev, MT_WPDMA_GLO_CFG,
                MT_WPDMA_GLO_CFG_TX_WRITEBACK_DONE |
                MT_WPDMA_GLO_CFG_FIFO_LITTLE_ENDIAN |

diff --git a/drivers/net/wireless/mediatek/mt76/tx.c b/drivers/net/wireless/mediatek/mt76/tx.c
index 969fedf..763b161 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/tx.c
+++ b/drivers/net/wireless/mediatek/mt76/tx.c
@@ -557,6 +557,13 @@ void mt76_txq_schedule_all(struct mt76_dev *dev)
 }
 EXPORT_SYMBOL_GPL(mt76_txq_schedule_all);
 
+void mt76_tx_tasklet(unsigned long data)
+{
+       struct mt76_dev *dev = (struct mt76_dev *)data;
+
+       mt76_txq_schedule_all(dev);
+}
+
 void mt76_stop_tx_queues(struct mt76_dev *dev, struct ieee80211_sta *sta,
                         bool send_bar)
 {