wifi: mt76: mt7603: rely on shared sta_poll_list and sta_poll_lock

Rely on sta_poll_list and sta_poll_lock fields in mt76_dev structure
and get rid of private copies.

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

diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/init.c b/drivers/net/wireless/mediatek/mt76/mt7603/init.c
index 9a2e632..0762de3 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7603/init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7603/init.c
@@ -500,8 +500,6 @@ int mt7603_register_device(struct mt7603_dev *dev)
        bus_ops->rmw = mt7603_rmw;
        dev->mt76.bus = bus_ops;
 
-       INIT_LIST_HEAD(&dev->sta_poll_list);
-       spin_lock_init(&dev->sta_poll_lock);
        spin_lock_init(&dev->ps_lock);
 
        INIT_DELAYED_WORK(&dev->mphy.mac_work, mt7603_mac_work);

diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/mac.c b/drivers/net/wireless/mediatek/mt76/mt7603/mac.c
index 12e0af5..ac8a67e 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7603/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7603/mac.c
@@ -412,16 +412,16 @@ void mt7603_mac_sta_poll(struct mt7603_dev *dev)
        while (1) {
                bool clear = false;
 
-               spin_lock_bh(&dev->sta_poll_lock);
-               if (list_empty(&dev->sta_poll_list)) {
-                       spin_unlock_bh(&dev->sta_poll_lock);
+               spin_lock_bh(&dev->mt76.sta_poll_lock);
+               if (list_empty(&dev->mt76.sta_poll_list)) {
+                       spin_unlock_bh(&dev->mt76.sta_poll_lock);
                        break;
                }
 
-               msta = list_first_entry(&dev->sta_poll_list, struct mt7603_sta,
-                                       poll_list);
+               msta = list_first_entry(&dev->mt76.sta_poll_list,
+                                       struct mt7603_sta, poll_list);
                list_del_init(&msta->poll_list);
-               spin_unlock_bh(&dev->sta_poll_lock);
+               spin_unlock_bh(&dev->mt76.sta_poll_lock);
 
                addr = mt7603_wtbl4_addr(msta->wcid.idx);
                for (i = 0; i < 4; i++) {
@@ -1268,9 +1268,9 @@ void mt7603_mac_add_txs(struct mt7603_dev *dev, void *data)
        sta = wcid_to_sta(wcid);
 
        if (list_empty(&msta->poll_list)) {
-               spin_lock_bh(&dev->sta_poll_lock);
-               list_add_tail(&msta->poll_list, &dev->sta_poll_list);
-               spin_unlock_bh(&dev->sta_poll_lock);
+               spin_lock_bh(&dev->mt76.sta_poll_lock);
+               list_add_tail(&msta->poll_list, &dev->mt76.sta_poll_list);
+               spin_unlock_bh(&dev->mt76.sta_poll_lock);
        }
 
        if (mt7603_mac_add_txs_skb(dev, msta, pid, txs_data))

diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/main.c b/drivers/net/wireless/mediatek/mt76/mt7603/main.c
index 1b1358c..6d2295c 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7603/main.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7603/main.c
@@ -100,10 +100,10 @@ mt7603_remove_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
 
        rcu_assign_pointer(dev->mt76.wcid[idx], NULL);
 
-       spin_lock_bh(&dev->sta_poll_lock);
+       spin_lock_bh(&dev->mt76.sta_poll_lock);
        if (!list_empty(&msta->poll_list))
                list_del_init(&msta->poll_list);
-       spin_unlock_bh(&dev->sta_poll_lock);
+       spin_unlock_bh(&dev->mt76.sta_poll_lock);
 
        mutex_lock(&dev->mt76.mutex);
        dev->mt76.vif_mask &= ~BIT_ULL(mvif->idx);
@@ -388,10 +388,10 @@ mt7603_sta_remove(struct mt76_dev *mdev, struct ieee80211_vif *vif,
        mt7603_filter_tx(dev, wcid->idx, true);
        spin_unlock_bh(&dev->ps_lock);
 
-       spin_lock_bh(&dev->sta_poll_lock);
+       spin_lock_bh(&mdev->sta_poll_lock);
        if (!list_empty(&msta->poll_list))
                list_del_init(&msta->poll_list);
-       spin_unlock_bh(&dev->sta_poll_lock);
+       spin_unlock_bh(&mdev->sta_poll_lock);
 
        mt7603_wtbl_clear(dev, wcid->idx);
 }

diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h b/drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h
index 7c3be59..689922d 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h
@@ -110,9 +110,6 @@ struct mt7603_dev {
 
        u32 rxfilter;
 
-       struct list_head sta_poll_list;
-       spinlock_t sta_poll_lock;
-
        struct mt7603_sta global_sta;
 
        u32 agc0, agc3;