mt76: remove mt76_wcid pointer from mt76_tx_status_check signature

Remove mt76_wcid pointer from mt76_tx_status_check signature since it is
always set to NULL

Tested-by: mrkiko.rs@gmail.com
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 ddc692d7b59e10264d1987f27d3ee9777cecf9ff..61fff98c1fd66f9eec1ce55cb76f057ce58ec7bd 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mac80211.c
+++ b/drivers/net/wireless/mediatek/mt76/mac80211.c
@@ -511,7 +511,7 @@ void mt76_unregister_phy(struct mt76_phy *phy)
 {
        struct mt76_dev *dev = phy->dev;
 
-       mt76_tx_status_check(dev, NULL, true);
+       mt76_tx_status_check(dev, true);
        ieee80211_unregister_hw(phy->hw);
        dev->phy2 = NULL;
 }
@@ -639,7 +639,7 @@ void mt76_unregister_device(struct mt76_dev *dev)
 
        if (IS_ENABLED(CONFIG_MT76_LEDS))
                mt76_led_cleanup(dev);
-       mt76_tx_status_check(dev, NULL, true);
+       mt76_tx_status_check(dev, true);
        ieee80211_unregister_hw(hw);
 }
 EXPORT_SYMBOL_GPL(mt76_unregister_device);

diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h
index 7bd82cfbf0b550b6d072663993da51627ee875d2..1c18e75c3f6accea5f31d0c45b1b7afbafc9821d 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76.h
@@ -1116,8 +1116,7 @@ mt76_tx_complete_skb(struct mt76_dev *dev, u16 wcid, struct sk_buff *skb)
     __mt76_tx_complete_skb(dev, wcid, skb, NULL);
 }
 
-void mt76_tx_status_check(struct mt76_dev *dev, struct mt76_wcid *wcid,
-                         bool flush);
+void mt76_tx_status_check(struct mt76_dev *dev, bool flush);
 int mt76_sta_state(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
                   struct ieee80211_sta *sta,
                   enum ieee80211_sta_state old_state,

diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/mac.c b/drivers/net/wireless/mediatek/mt76/mt7603/mac.c
index d1cbe06ee8da4deeba548efc0581f00b3291abd8..fe03e31989bb14ad6c6bf14e88b37739bd926fa5 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7603/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7603/mac.c
@@ -1458,7 +1458,7 @@ static void mt7603_mac_watchdog_reset(struct mt7603_dev *dev)
                mt76_queue_rx_reset(dev, i);
        }
 
-       mt76_tx_status_check(&dev->mt76, NULL, true);
+       mt76_tx_status_check(&dev->mt76, true);
 
        mt7603_dma_sched_reset(dev);
 
@@ -1817,7 +1817,7 @@ void mt7603_mac_work(struct work_struct *work)
        bool reset = false;
        int i, idx;
 
-       mt76_tx_status_check(&dev->mt76, NULL, false);
+       mt76_tx_status_check(&dev->mt76, false);
 
        mutex_lock(&dev->mt76.mutex);
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
index 5455231f51881a529a8e9e040b60b2896a3436ea..423f69015e3ec14209d8fc6acee9f04fc5163755 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mac.c
@@ -2026,7 +2026,7 @@ void mt7615_mac_work(struct work_struct *work)
 
        mt7615_mutex_release(phy->dev);
 
-       mt76_tx_status_check(mphy->dev, NULL, false);
+       mt76_tx_status_check(mphy->dev, false);
 
        timeout = mt7615_get_macwork_timeout(phy->dev);
        ieee80211_queue_delayed_work(mphy->hw, &mphy->mac_work, timeout);

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/pci_mac.c b/drivers/net/wireless/mediatek/mt76/mt7615/pci_mac.c
index 0a4caddeb75dcf8ba8e744510c6a40fe6bd2ac6f..5ee52cd70a4b45a1be50b518015a8e0943b71879 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/pci_mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/pci_mac.c
@@ -198,7 +198,7 @@ void mt7615_dma_reset(struct mt7615_dev *dev)
        mt76_for_each_q_rx(&dev->mt76, i)
                mt76_queue_rx_reset(dev, i);
 
-       mt76_tx_status_check(&dev->mt76, NULL, true);
+       mt76_tx_status_check(&dev->mt76, true);
 
        mt7615_dma_start(dev);
 }

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/sdio.c b/drivers/net/wireless/mediatek/mt76/mt7615/sdio.c
index 305bb8597531b0c024576229d119ca96b7010c38..fb0f8f34b8f27aec5f1babb43ed6f4bc2c7dfd22 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/sdio.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/sdio.c
@@ -432,7 +432,7 @@ static int mt7663s_suspend(struct device *dev)
        cancel_work_sync(&mdev->mt76.sdio.stat_work);
        clear_bit(MT76_READING_STATS, &mdev->mphy.state);
 
-       mt76_tx_status_check(&mdev->mt76, NULL, true);
+       mt76_tx_status_check(&mdev->mt76, true);
 
        return 0;
 }

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c b/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c
index 07b21b208582364434fa3de923d80bcf61a86fac..a404fd7ea9684babe9571b4737b02ea7b5cfd073 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c
@@ -1186,7 +1186,7 @@ void mt76x02_mac_work(struct work_struct *work)
 
        mutex_unlock(&dev->mt76.mutex);
 
-       mt76_tx_status_check(&dev->mt76, NULL, false);
+       mt76_tx_status_check(&dev->mt76, false);
 
        ieee80211_queue_delayed_work(mt76_hw(dev), &dev->mphy.mac_work,
                                     MT_MAC_WORK_INTERVAL);

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c b/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c
index 468be651010dea8929409e35f3c0fcd0fb95cbd5..ec0de691129af3a389dec0b1aaa7bfeeea22f572 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c
@@ -472,7 +472,7 @@ static void mt76x02_watchdog_reset(struct mt76x02_dev *dev)
                mt76_queue_rx_reset(dev, i);
        }
 
-       mt76_tx_status_check(&dev->mt76, NULL, true);
+       mt76_tx_status_check(&dev->mt76, true);
 
        mt76x02_mac_start(dev);
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
index 3e699193705e77b3eed0ab12b50df630ae48d848..48777993b7ee28a2eefc574ccd9e6f9401dd4544 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mac.c
@@ -1792,7 +1792,7 @@ mt7915_dma_reset(struct mt7915_dev *dev)
        mt76_for_each_q_rx(&dev->mt76, i)
                mt76_queue_rx_reset(dev, i);
 
-       mt76_tx_status_check(&dev->mt76, NULL, true);
+       mt76_tx_status_check(&dev->mt76, true);
 
        /* re-init prefetch settings after reset */
        mt7915_dma_prefetch(dev);
@@ -2105,7 +2105,7 @@ void mt7915_mac_work(struct work_struct *work)
 
        mutex_unlock(&mphy->dev->mutex);
 
-       mt76_tx_status_check(mphy->dev, NULL, false);
+       mt76_tx_status_check(mphy->dev, false);
 
        ieee80211_queue_delayed_work(mphy->hw, &mphy->mac_work,
                                     MT7915_WATCHDOG_TIME);

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/dma.c b/drivers/net/wireless/mediatek/mt76/mt7921/dma.c
index 62cee662ba281fefef0ab0ac657e3299150f009e..802e40e42040f471053cd2c50988b56358027a14 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/dma.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/dma.c
@@ -272,7 +272,7 @@ static int mt7921_dma_reset(struct mt7921_dev *dev, bool force)
        mt76_for_each_q_rx(&dev->mt76, i)
                mt76_queue_reset(dev, &dev->mt76.q_rx[i]);
 
-       mt76_tx_status_check(&dev->mt76, NULL, true);
+       mt76_tx_status_check(&dev->mt76, true);
 
        return mt7921_dma_enable(dev);
 }

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
index 14024ae50d1c7d968e7a964f2321bd3287951d27..0659ff290af945489dd64186b90dc04e10719fd1 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
@@ -1694,7 +1694,7 @@ void mt7921_mac_work(struct work_struct *work)
 
        mt7921_mutex_release(phy->dev);
 
-       mt76_tx_status_check(mphy->dev, NULL, false);
+       mt76_tx_status_check(mphy->dev, false);
        ieee80211_queue_delayed_work(phy->mt76->hw, &mphy->mac_work,
                                     MT7921_WATCHDOG_TIME);
 }

diff --git a/drivers/net/wireless/mediatek/mt76/sdio.c b/drivers/net/wireless/mediatek/mt76/sdio.c
index 783a15635ec52899b02193447c82c25348769d48..4abf432750c6df080dd276ac4c8ee38a5414e271 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/sdio.c
+++ b/drivers/net/wireless/mediatek/mt76/sdio.c
@@ -328,7 +328,7 @@ void mt76s_deinit(struct mt76_dev *dev)
        cancel_work_sync(&sdio->stat_work);
        clear_bit(MT76_READING_STATS, &dev->phy.state);
 
-       mt76_tx_status_check(dev, NULL, true);
+       mt76_tx_status_check(dev, true);
 
        sdio_claim_host(sdio->func);
        sdio_release_irq(sdio->func);

diff --git a/drivers/net/wireless/mediatek/mt76/tx.c b/drivers/net/wireless/mediatek/mt76/tx.c
index 15916f6d9f1b6dd0aa19cc685b3fea7314cb23a6..8b4c6ce900eebef94aa70720178b028111778f50 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/tx.c
+++ b/drivers/net/wireless/mediatek/mt76/tx.c
@@ -193,10 +193,10 @@ out:
 EXPORT_SYMBOL_GPL(mt76_tx_status_skb_get);
 
 void
-mt76_tx_status_check(struct mt76_dev *dev, struct mt76_wcid *wcid, bool flush)
+mt76_tx_status_check(struct mt76_dev *dev, bool flush)
 {
+       struct mt76_wcid *wcid, *tmp;
        struct sk_buff_head list;
-       struct mt76_wcid *tmp;
 
        mt76_tx_status_lock(dev, &list);
        list_for_each_entry_safe(wcid, tmp, &dev->wcid_list, list)

diff --git a/drivers/net/wireless/mediatek/mt76/usb.c b/drivers/net/wireless/mediatek/mt76/usb.c
index 1e9f60bb811ad110881e9c5933ae83ef364683b0..0a7006c8959b1630be92eb4780c509b7d53fbab8 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/usb.c
+++ b/drivers/net/wireless/mediatek/mt76/usb.c
@@ -1081,7 +1081,7 @@ void mt76u_stop_tx(struct mt76_dev *dev)
 
        mt76_worker_enable(&dev->usb.status_worker);
 
-       mt76_tx_status_check(dev, NULL, true);
+       mt76_tx_status_check(dev, true);
 }
 EXPORT_SYMBOL_GPL(mt76u_stop_tx);