Commit c02f86ee authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Felix Fietkau
Browse files

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: default avatar <mrkiko.rs@gmail.com>
Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent bd1e3e7b

drivers/net/wireless/mediatek/mt76/mac80211.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

drivers/net/wireless/mediatek/mt76/mt76.h

+1 −2
Original line number Diff line number Diff line
@@ -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,

drivers/net/wireless/mediatek/mt76/mt7603/mac.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

drivers/net/wireless/mediatek/mt76/mt7615/mac.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

drivers/net/wireless/mediatek/mt76/mt7615/pci_mac.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

}