mt76: mt7921: get rid of mt7921_mcu_exit

Run skb_queue_purge when needed.

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

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
index 86d50c28d5376ab38181cd50c2f5e5fa3c676d98..09b7bd562a98b168683a2b68031f5fab7e80b9df 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
@@ -773,12 +773,6 @@ int mt7921_run_firmware(struct mt7921_dev *dev)
 }
 EXPORT_SYMBOL_GPL(mt7921_run_firmware);
 
-void mt7921_mcu_exit(struct mt7921_dev *dev)
-{
-       skb_queue_purge(&dev->mt76.mcu.res_q);
-}
-EXPORT_SYMBOL_GPL(mt7921_mcu_exit);
-
 int mt7921_mcu_set_tx(struct mt7921_dev *dev, struct ieee80211_vif *vif)
 {
        struct mt7921_vif *mvif = (struct mt7921_vif *)vif->drv_priv;

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h b/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
index d9fc457e420d220d2f2f0d30fe3cfd12cb271a2b..f630f02499280d138d70b7a57ac67d495fe186fe 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
@@ -305,7 +305,6 @@ int mt7921_mcu_get_rx_rate(struct mt7921_phy *phy, struct ieee80211_vif *vif,
                           struct ieee80211_sta *sta, struct rate_info *rate);
 int mt7921_mcu_fw_log_2_host(struct mt7921_dev *dev, u8 ctrl);
 void mt7921_mcu_rx_event(struct mt7921_dev *dev, struct sk_buff *skb);
-void mt7921_mcu_exit(struct mt7921_dev *dev);
 
 static inline void mt7921_irq_enable(struct mt7921_dev *dev, u32 mask)
 {

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/pci.c b/drivers/net/wireless/mediatek/mt76/mt7921/pci.c
index b5fb22b8e0869d65388f5f0b7cf318930e15ce32..624eb75c15cd8f580686776525174c9cb0d84674 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/pci.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/pci.c
@@ -116,7 +116,7 @@ static void mt7921e_unregister_device(struct mt7921_dev *dev)
        mt7921_mcu_drv_pmctrl(dev);
        mt7921_dma_cleanup(dev);
        mt7921_wfsys_reset(dev);
-       mt7921_mcu_exit(dev);
+       skb_queue_purge(&dev->mt76.mcu.res_q);
 
        tasklet_disable(&dev->irq_tasklet);
 }

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/sdio.c b/drivers/net/wireless/mediatek/mt76/mt7921/sdio.c
index af26d59fa2f04463c4ee4c74016725bc3138836d..487acd6e2be8fd031e6d697b178b73f17deba94e 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/sdio.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/sdio.c
@@ -48,7 +48,7 @@ static void mt7921s_unregister_device(struct mt7921_dev *dev)
 
        mt76s_deinit(&dev->mt76);
        mt7921s_wfsys_reset(dev);
-       mt7921_mcu_exit(dev);
+       skb_queue_purge(&dev->mt76.mcu.res_q);
 
        mt76_free_device(&dev->mt76);
 }

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/usb.c b/drivers/net/wireless/mediatek/mt76/mt7921/usb.c
index dc38baef273a708ab14a4b6b432ed6110306eddc..4e4cd2dc2aeb829a03b906208cf32228c7dbf454 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/usb.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/usb.c
@@ -158,7 +158,7 @@ static void mt7921u_cleanup(struct mt7921_dev *dev)
 {
        clear_bit(MT76_STATE_INITIALIZED, &dev->mphy.state);
        mt7921u_wfsys_reset(dev);
-       mt7921_mcu_exit(dev);
+       skb_queue_purge(&dev->mt76.mcu.res_q);
        mt76u_queues_deinit(&dev->mt76);
 }
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/usb_mac.c b/drivers/net/wireless/mediatek/mt76/mt7921/usb_mac.c
index cd2f09743d2f7064288baebe817ec485c8e914bb..efbd3954c883ff8f0c55769cd8eba31869442e80 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/usb_mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/usb_mac.c
@@ -185,7 +185,7 @@ int mt7921u_init_reset(struct mt7921_dev *dev)
        set_bit(MT76_RESET, &dev->mphy.state);
 
        wake_up(&dev->mt76.mcu.wait);
-       mt7921_mcu_exit(dev);
+       skb_queue_purge(&dev->mt76.mcu.res_q);
 
        mt76u_stop_rx(&dev->mt76);
        mt76u_stop_tx(&dev->mt76);
@@ -208,7 +208,7 @@ int mt7921u_mac_reset(struct mt7921_dev *dev)
        set_bit(MT76_MCU_RESET, &dev->mphy.state);
 
        wake_up(&dev->mt76.mcu.wait);
-       mt7921_mcu_exit(dev);
+       skb_queue_purge(&dev->mt76.mcu.res_q);
 
        mt76u_stop_rx(&dev->mt76);
        mt76u_stop_tx(&dev->mt76);