iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mt76x0: pci: add mt76x0e_cleanup routine

Browse Source 
Add mt76x0e_cleanup routine to tidy up the device
during device removal

Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Lorenzo Bianconi 2018-10-01 10:55:54 +02:00 committed by Felix Fietkau
parent e1c02eb16a
commit d00efcf123
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/net/wireless/mediatek/mt76/mt76x0/pci.c
View File

@ -41,13 +41,8 @@ static int mt76x0e_start(struct ieee80211_hw *hw)
return 0; return 0;
} }
static void mt76x0e_stop(struct ieee80211_hw *hw) static void mt76x0e_stop_hw(struct mt76x0_dev *dev)
{ {
struct mt76x0_dev *dev = hw->priv;
mutex_lock(&dev->mt76.mutex);
clear_bit(MT76_STATE_RUNNING, &dev->mt76.state);
cancel_delayed_work_sync(&dev->cal_work); cancel_delayed_work_sync(&dev->cal_work);
cancel_delayed_work_sync(&dev->mac_work); cancel_delayed_work_sync(&dev->mac_work);
@ -62,7 +57,15 @@ static void mt76x0e_stop(struct ieee80211_hw *hw)
0, 1000)) 0, 1000))
dev_warn(dev->mt76.dev, "TX DMA did not stop\n"); dev_warn(dev->mt76.dev, "TX DMA did not stop\n");
mt76_clear(dev, MT_WPDMA_GLO_CFG, MT_WPDMA_GLO_CFG_RX_DMA_EN); mt76_clear(dev, MT_WPDMA_GLO_CFG, MT_WPDMA_GLO_CFG_RX_DMA_EN);
}
static void mt76x0e_stop(struct ieee80211_hw *hw)
{
struct mt76x0_dev *dev = hw->priv;
mutex_lock(&dev->mt76.mutex);
clear_bit(MT76_STATE_RUNNING, &dev->mt76.state);
mt76x0e_stop_hw(dev);
mutex_unlock(&dev->mt76.mutex); mutex_unlock(&dev->mt76.mutex);
} }
@ -160,12 +163,23 @@ error:
return ret; return ret;
} }
static void mt76x0e_cleanup(struct mt76x0_dev *dev)
{
clear_bit(MT76_STATE_INITIALIZED, &dev->mt76.state);
mt76x0_chip_onoff(dev, false, false);
mt76x0e_stop_hw(dev);
mt76_dma_cleanup(&dev->mt76);
mt76x02_mcu_cleanup(&dev->mt76);
}
static void static void
mt76x0e_remove(struct pci_dev *pdev) mt76x0e_remove(struct pci_dev *pdev)
{ {
struct mt76_dev *mdev = pci_get_drvdata(pdev); struct mt76_dev *mdev = pci_get_drvdata(pdev);
struct mt76x0_dev *dev = container_of(mdev, struct mt76x0_dev, mt76);
mt76_unregister_device(mdev); mt76_unregister_device(mdev);
mt76x0e_cleanup(dev);
ieee80211_free_hw(mdev->hw); ieee80211_free_hw(mdev->hw);
} }