mt76: testmode: move mtd part to mt76_dev

Move testmode mtd variables to mt76_dev, since they are the same on
each phy.

Signed-off-by: Shayne Chen <shayne.chen@mediatek.com>
Acked-by: Ryder Lee <ryder.lee@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/eeprom.c b/drivers/net/wireless/mediatek/mt76/eeprom.c
index ffc9d54..665b54c 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/eeprom.c
+++ b/drivers/net/wireless/mediatek/mt76/eeprom.c
@@ -75,8 +75,8 @@ mt76_get_of_eeprom(struct mt76_dev *dev, int len)
        }
 
 #ifdef CONFIG_NL80211_TESTMODE
-       dev->phy.test.mtd_name = devm_kstrdup(dev->dev, part, GFP_KERNEL);
-       dev->phy.test.mtd_offset = offset;
+       dev->test_mtd.name = devm_kstrdup(dev->dev, part, GFP_KERNEL);
+       dev->test_mtd.offset = offset;
 #endif
 
 out_put_node:

diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h
index a5eead7..10034c2 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76.h
@@ -545,9 +545,6 @@ struct mt76_testmode_data {
        u8 tx_power[4];
        u8 tx_power_control;
 
-       const char *mtd_name;
-       u32 mtd_offset;
-
        u32 tx_pending;
        u32 tx_queued;
        u32 tx_done;
@@ -665,6 +662,10 @@ struct mt76_dev {
 
 #ifdef CONFIG_NL80211_TESTMODE
        const struct mt76_testmode_ops *test_ops;
+       struct {
+               const char *name;
+               u32 offset;
+       } test_mtd;
 #endif
        struct workqueue_struct *wq;
 

diff --git a/drivers/net/wireless/mediatek/mt76/testmode.c b/drivers/net/wireless/mediatek/mt76/testmode.c
index 184964b..8b14620 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/testmode.c
+++ b/drivers/net/wireless/mediatek/mt76/testmode.c
@@ -482,9 +482,9 @@ int mt76_testmode_dump(struct ieee80211_hw *hw, struct sk_buff *msg,
        if (nla_put_u32(msg, MT76_TM_ATTR_STATE, td->state))
                goto out;
 
-       if (td->mtd_name &&
-           (nla_put_string(msg, MT76_TM_ATTR_MTD_PART, td->mtd_name) ||
-            nla_put_u32(msg, MT76_TM_ATTR_MTD_OFFSET, td->mtd_offset)))
+       if (dev->test_mtd.name &&
+           (nla_put_string(msg, MT76_TM_ATTR_MTD_PART, dev->test_mtd.name) ||
+            nla_put_u32(msg, MT76_TM_ATTR_MTD_OFFSET, dev->test_mtd.offset)))
                goto out;
 
        if (nla_put_u32(msg, MT76_TM_ATTR_TX_COUNT, td->tx_count) ||