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

mt76: remove mt76_wcid pointer from mt76_tx_status_check signature

Browse Source 
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>
This commit is contained in:
Lorenzo Bianconi
2021-09-13 11:25:03 +02:00
committed by Felix Fietkau
parent bd1e3e7b69
commit c02f86eee8
14 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/wireless/mediatek/mt76/mac80211.c
View File

@@ -511,7 +511,7 @@ void mt76_unregister_phy(struct mt76_phy *phy)
{ {
struct mt76_dev *dev = phy->dev; struct mt76_dev *dev = phy->dev;
mt76_tx_status_check(dev, NULL, true); mt76_tx_status_check(dev, true);
ieee80211_unregister_hw(phy->hw); ieee80211_unregister_hw(phy->hw);
dev->phy2 = NULL; dev->phy2 = NULL;
} }
@@ -639,7 +639,7 @@ void mt76_unregister_device(struct mt76_dev *dev)
if (IS_ENABLED(CONFIG_MT76_LEDS)) if (IS_ENABLED(CONFIG_MT76_LEDS))
mt76_led_cleanup(dev); mt76_led_cleanup(dev);
mt76_tx_status_check(dev, NULL, true); mt76_tx_status_check(dev, true);
ieee80211_unregister_hw(hw); ieee80211_unregister_hw(hw);
} }
EXPORT_SYMBOL_GPL(mt76_unregister_device); EXPORT_SYMBOL_GPL(mt76_unregister_device);

3
drivers/net/wireless/mediatek/mt76/mt76.h
View File

@@ -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); __mt76_tx_complete_skb(dev, wcid, skb, NULL);
} }
void mt76_tx_status_check(struct mt76_dev *dev, struct mt76_wcid *wcid, void mt76_tx_status_check(struct mt76_dev *dev, bool flush);
bool flush);
int mt76_sta_state(struct ieee80211_hw *hw, struct ieee80211_vif *vif, int mt76_sta_state(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
struct ieee80211_sta *sta, struct ieee80211_sta *sta,
enum ieee80211_sta_state old_state, enum ieee80211_sta_state old_state,

4
drivers/net/wireless/mediatek/mt76/mt7603/mac.c
View File

@@ -1458,7 +1458,7 @@ static void mt7603_mac_watchdog_reset(struct mt7603_dev *dev)
mt76_queue_rx_reset(dev, i); 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); mt7603_dma_sched_reset(dev);
@@ -1817,7 +1817,7 @@ void mt7603_mac_work(struct work_struct *work)
bool reset = false; bool reset = false;
int i, idx; int i, idx;
mt76_tx_status_check(&dev->mt76, NULL, false); mt76_tx_status_check(&dev->mt76, false);
mutex_lock(&dev->mt76.mutex); mutex_lock(&dev->mt76.mutex);

2
drivers/net/wireless/mediatek/mt76/mt7615/mac.c
View File

@@ -2026,7 +2026,7 @@ void mt7615_mac_work(struct work_struct *work)
mt7615_mutex_release(phy->dev); 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); timeout = mt7615_get_macwork_timeout(phy->dev);
ieee80211_queue_delayed_work(mphy->hw, &mphy->mac_work, timeout); ieee80211_queue_delayed_work(mphy->hw, &mphy->mac_work, timeout);

2
drivers/net/wireless/mediatek/mt76/mt7615/pci_mac.c
View File

@@ -198,7 +198,7 @@ void mt7615_dma_reset(struct mt7615_dev *dev)
mt76_for_each_q_rx(&dev->mt76, i) mt76_for_each_q_rx(&dev->mt76, i)
mt76_queue_rx_reset(dev, 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); mt7615_dma_start(dev);
} }

2
drivers/net/wireless/mediatek/mt76/mt7615/sdio.c
View File

@@ -432,7 +432,7 @@ static int mt7663s_suspend(struct device *dev)
cancel_work_sync(&mdev->mt76.sdio.stat_work); cancel_work_sync(&mdev->mt76.sdio.stat_work);
clear_bit(MT76_READING_STATS, &mdev->mphy.state); 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; return 0;
} }

2
drivers/net/wireless/mediatek/mt76/mt76x02_mac.c
View File

@@ -1186,7 +1186,7 @@ void mt76x02_mac_work(struct work_struct *work)
mutex_unlock(&dev->mt76.mutex); 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, ieee80211_queue_delayed_work(mt76_hw(dev), &dev->mphy.mac_work,
MT_MAC_WORK_INTERVAL); MT_MAC_WORK_INTERVAL);

2
drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c
View File

@@ -472,7 +472,7 @@ static void mt76x02_watchdog_reset(struct mt76x02_dev *dev)
mt76_queue_rx_reset(dev, i); 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); mt76x02_mac_start(dev);

4
drivers/net/wireless/mediatek/mt76/mt7915/mac.c
View File

@@ -1792,7 +1792,7 @@ mt7915_dma_reset(struct mt7915_dev *dev)
mt76_for_each_q_rx(&dev->mt76, i) mt76_for_each_q_rx(&dev->mt76, i)
mt76_queue_rx_reset(dev, 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 */ /* re-init prefetch settings after reset */
mt7915_dma_prefetch(dev); mt7915_dma_prefetch(dev);
@@ -2105,7 +2105,7 @@ void mt7915_mac_work(struct work_struct *work)
mutex_unlock(&mphy->dev->mutex); 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, ieee80211_queue_delayed_work(mphy->hw, &mphy->mac_work,
MT7915_WATCHDOG_TIME); MT7915_WATCHDOG_TIME);

2
drivers/net/wireless/mediatek/mt76/mt7921/dma.c
View File

@@ -272,7 +272,7 @@ static int mt7921_dma_reset(struct mt7921_dev *dev, bool force)
mt76_for_each_q_rx(&dev->mt76, i) mt76_for_each_q_rx(&dev->mt76, i)
mt76_queue_reset(dev, &dev->mt76.q_rx[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); return mt7921_dma_enable(dev);
} }

2
drivers/net/wireless/mediatek/mt76/mt7921/mac.c
View File

@@ -1694,7 +1694,7 @@ void mt7921_mac_work(struct work_struct *work)
mt7921_mutex_release(phy->dev); 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, ieee80211_queue_delayed_work(phy->mt76->hw, &mphy->mac_work,
MT7921_WATCHDOG_TIME); MT7921_WATCHDOG_TIME);
} }

2
drivers/net/wireless/mediatek/mt76/sdio.c
View File

@@ -328,7 +328,7 @@ void mt76s_deinit(struct mt76_dev *dev)
cancel_work_sync(&sdio->stat_work); cancel_work_sync(&sdio->stat_work);
clear_bit(MT76_READING_STATS, &dev->phy.state); 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_claim_host(sdio->func);
sdio_release_irq(sdio->func); sdio_release_irq(sdio->func);

4
drivers/net/wireless/mediatek/mt76/tx.c
View File

@@ -193,10 +193,10 @@ out:
EXPORT_SYMBOL_GPL(mt76_tx_status_skb_get); EXPORT_SYMBOL_GPL(mt76_tx_status_skb_get);
void 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 sk_buff_head list;
struct mt76_wcid *tmp;
mt76_tx_status_lock(dev, &list); mt76_tx_status_lock(dev, &list);
list_for_each_entry_safe(wcid, tmp, &dev->wcid_list, list) list_for_each_entry_safe(wcid, tmp, &dev->wcid_list, list)

2
drivers/net/wireless/mediatek/mt76/usb.c
View File

@@ -1081,7 +1081,7 @@ void mt76u_stop_tx(struct mt76_dev *dev)
mt76_worker_enable(&dev->usb.status_worker); 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); EXPORT_SYMBOL_GPL(mt76u_stop_tx);