mt76: move mt76_reg_pair definition in mt76.h

Move common definition of mt76_reg_pair in mt76.h
and remove duplicated code in mt76x2_init_common.c

Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/mediatek/mt76/mt76.h b/drivers/net/wireless/mediatek/mt76/mt76.h
index b02b419..fc27260 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76.h
@@ -53,6 +53,11 @@ enum mt76_txq_id {
        __MT_TXQ_MAX
 };
 
+struct mt76_reg_pair {
+       u32 reg;
+       u32 value;
+};
+
 enum mt76_rxq_id {
        MT_RXQ_MAIN,
        MT_RXQ_MCU,

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h b/drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h
index 15353a2..50bfbff 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76x0/mt76x0.h
@@ -219,11 +219,6 @@ struct mt76x0_wcid {
        u8 tx_rate_nss;
 };
 
-struct mt76_reg_pair {
-       u32 reg;
-       u32 value;
-};
-
 struct mt76x0_rxwi;
 
 extern const struct ieee80211_ops mt76x0_ops;

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2_init_common.c b/drivers/net/wireless/mediatek/mt76/mt76x2_init_common.c
index eccdf80..9dca0e9 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2_init_common.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2_init_common.c
@@ -47,11 +47,6 @@ struct ieee80211_rate mt76x2_rates[] = {
 };
 EXPORT_SYMBOL_GPL(mt76x2_rates);
 
-struct mt76x2_reg_pair {
-       u32 reg;
-       u32 value;
-};
-
 static void
 mt76x2_set_wlan_state(struct mt76x2_dev *dev, bool enable)
 {
@@ -93,7 +88,7 @@ EXPORT_SYMBOL_GPL(mt76x2_reset_wlan);
 
 static void
 mt76x2_write_reg_pairs(struct mt76x2_dev *dev,
-                      const struct mt76x2_reg_pair *data, int len)
+                      const struct mt76_reg_pair *data, int len)
 {
        while (len > 0) {
                mt76_wr(dev, data->reg, data->value);
@@ -128,7 +123,7 @@ void mt76_write_mac_initvals(struct mt76x2_dev *dev)
         FIELD_PREP(MT_PROT_CFG_NAV, 1) |                       \
         FIELD_PREP(MT_PROT_CFG_TXOP_ALLOW, 0x3f))
 
-       static const struct mt76x2_reg_pair vals[] = {
+       static const struct mt76_reg_pair vals[] = {
                /* Copied from MediaTek reference source */
                { MT_PBF_SYS_CTRL,              0x00080c00 },
                { MT_PBF_CFG,                   0x1efebcff },
@@ -184,7 +179,7 @@ void mt76_write_mac_initvals(struct mt76x2_dev *dev)
                { MT_PROT_AUTO_TX_CFG,          0x00830083 },
                { MT_HT_CTRL_CFG,               0x000001ff },
        };
-       struct mt76x2_reg_pair prot_vals[] = {
+       struct mt76_reg_pair prot_vals[] = {
                { MT_CCK_PROT_CFG,              DEFAULT_PROT_CFG_CCK },
                { MT_OFDM_PROT_CFG,             DEFAULT_PROT_CFG_OFDM },
                { MT_MM20_PROT_CFG,             DEFAULT_PROT_CFG_20 },