mt76x0: remove unused variable in mt76x0_dev

Remove no longer used mac_lock spinlock and data array
in mt76x0_dev data structure

Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/init.c b/drivers/net/wireless/mediatek/mt76/mt76x0/init.c
index a2c38aea486e5e1e1b34304b140f2ebb1fe82348..c4ea89e61c40ab300543e22045db9ccff995c7ba 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x0/init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x0/init.c
@@ -347,7 +347,6 @@ mt76x0_alloc_device(struct device *pdev,
        dev = container_of(mdev, struct mt76x0_dev, mt76);
        mutex_init(&dev->reg_atomic_mutex);
        mutex_init(&dev->hw_atomic_mutex);
-       spin_lock_init(&dev->mac_lock);
        atomic_set(&dev->avg_ampdu_len, 1);
 
        return dev;

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h b/drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h
index 9060be6b071e2976a1b3762a212013514e8997ba..178fb4f085c58308db1dc9f2bffc35dcb677c791 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h
@@ -69,7 +69,6 @@ enum mt_bw {
 /**
  * struct mt76x0_dev - adapter structure
  * @lock:              protects @wcid->tx_rate.
- * @mac_lock:          locks out mac80211's tx status and rx paths.
  * @mutex:             ensures exclusive access from mac80211 callbacks.
  * @reg_atomic_mutex:  ensures atomicity of indirect register accesses
  *                     (accesses to RF and BBP).
@@ -79,13 +78,9 @@ enum mt_bw {
 struct mt76x0_dev {
        struct mt76_dev mt76; /* must be first */
 
-       u8 data[32];
-
        struct delayed_work cal_work;
        struct delayed_work mac_work;
 
-       spinlock_t mac_lock;
-
        struct mt76x0_caldata caldata;
 
        struct mutex reg_atomic_mutex;