mt76: move netif_napi_del in mt76_dma_cleanup

Move netif_napi_del in mt76_dma_cleanup routine since it is done
by all 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/dma.c b/drivers/net/wireless/mediatek/mt76/dma.c
index 4381155375e1e0b6a7f108382ef3e09006c19eed..d8f61e540bfd30f76417b790a07ab0e94c2cc5b8 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/dma.c
+++ b/drivers/net/wireless/mediatek/mt76/dma.c
@@ -588,6 +588,7 @@ void mt76_dma_cleanup(struct mt76_dev *dev)
 {
        int i;
 
+       netif_napi_del(&dev->tx_napi);
        for (i = 0; i < ARRAY_SIZE(dev->q_tx); i++)
                mt76_dma_tx_cleanup(dev, i, true);
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/dma.c b/drivers/net/wireless/mediatek/mt76/mt7603/dma.c
index 54314f6803c5b41d70b563196651a8ca6c945e53..58dc511f93c54e2d1a20ef575182a44df6ab4afe 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7603/dma.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7603/dma.c
@@ -250,6 +250,5 @@ void mt7603_dma_cleanup(struct mt7603_dev *dev)
                   MT_WPDMA_GLO_CFG_TX_WRITEBACK_DONE);
 
        tasklet_kill(&dev->mt76.tx_tasklet);
-       netif_napi_del(&dev->mt76.tx_napi);
        mt76_dma_cleanup(&dev->mt76);
 }

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/dma.c b/drivers/net/wireless/mediatek/mt76/mt7615/dma.c
index 9c565c93988a8c2344557ef8f7eeacb13a1b2ddc..6a70273d4a694f60c3e7fa804265ff1aaacaab7d 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/dma.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/dma.c
@@ -220,6 +220,5 @@ void mt7615_dma_cleanup(struct mt7615_dev *dev)
        mt76_set(dev, MT_WPDMA_GLO_CFG, MT_WPDMA_GLO_CFG_SW_RESET);
 
        tasklet_kill(&dev->mt76.tx_tasklet);
-       netif_napi_del(&dev->mt76.tx_napi);
        mt76_dma_cleanup(&dev->mt76);
 }

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c b/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c
index 617934565818c61425b31485e58be8d52ffb14d4..467b28379870470eaccb507644f250a9be74d2b6 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c
@@ -335,7 +335,6 @@ static void mt76x02_dma_enable(struct mt76x02_dev *dev)
 void mt76x02_dma_cleanup(struct mt76x02_dev *dev)
 {
        tasklet_kill(&dev->mt76.tx_tasklet);
-       netif_napi_del(&dev->mt76.tx_napi);
        mt76_dma_cleanup(&dev->mt76);
 }
 EXPORT_SYMBOL_GPL(mt76x02_dma_cleanup);