From 2cb46830faf7cd61af66705b3d1cb0e43840d443 Mon Sep 17 00:00:00 2001 From: Lorenzo Bianconi Date: Wed, 1 May 2019 16:06:23 +0200 Subject: [PATCH] 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 Signed-off-by: Felix Fietkau --- dma.c | 1 + mt7603/dma.c | 1 - mt7615/dma.c | 1 - mt76x02_mmio.c | 1 - 4 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dma.c b/dma.c index f53c34cb..6dd6a61c 100644 --- a/dma.c +++ b/dma.c @@ -586,6 +586,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/mt7603/dma.c b/mt7603/dma.c index 54314f68..58dc511f 100644 --- a/mt7603/dma.c +++ b/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/mt7615/dma.c b/mt7615/dma.c index 9c565c93..6a70273d 100644 --- a/mt7615/dma.c +++ b/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/mt76x02_mmio.c b/mt76x02_mmio.c index 74bbeeba..526f1c1a 100644 --- a/mt76x02_mmio.c +++ b/mt76x02_mmio.c @@ -334,7 +334,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);