wifi: mt76: mt7921: move hif_ops macro in mt792x.h

Move the following hif_ops macro in mt792x.h:
- mt7925_init_reset
- mt7925_dev_reset
- mt7925_mcu_init
- __mt7925_mcu_drv_pmctrl
- __mt7925_mcu_fw_pmctrl

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Deren Wu <deren.wu@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/init.c b/drivers/net/wireless/mediatek/mt76/mt7921/init.c
index 0a6f8f42b2e4f6131436334b2235a1c77c5a057a..6b8e31110fdfff32d84938f5a75226e2c7bc8035 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/init.c
@@ -107,7 +107,7 @@ static int __mt7921_init_hardware(struct mt792x_dev *dev)
         * which should be set before firmware download stage.
         */
        mt76_wr(dev, MT_SWDEF_MODE, MT_SWDEF_NORMAL_MODE);
-       ret = mt7921_mcu_init(dev);
+       ret = mt792x_mcu_init(dev);
        if (ret)
                goto out;
 
@@ -133,7 +133,7 @@ static int mt7921_init_hardware(struct mt792x_dev *dev)
                if (!ret)
                        break;
 
-               mt7921_init_reset(dev);
+               mt792x_init_reset(dev);
        }
 
        if (i == MT7921_MCU_INIT_RETRY_COUNT) {

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
index 70382194825ac31d9a2ac9e2d0570a6135d0ff51..25d853a75a234585c0228eccc0f699c0601275ce 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/mac.c
@@ -672,7 +672,7 @@ void mt7921_mac_reset_work(struct work_struct *work)
 
        for (i = 0; i < 10; i++) {
                mutex_lock(&dev->mt76.mutex);
-               ret = mt7921_dev_reset(dev);
+               ret = mt792x_dev_reset(dev);
                mutex_unlock(&dev->mt76.mutex);
 
                if (!ret)

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
index ed02fa48841cab34a9cce859a2e9164f70f5ec98..9bfa79893b10e5fcfd69dfc31b4a5a03fa1a0f2a 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
@@ -482,9 +482,9 @@ static int mt7921_load_firmware(struct mt792x_dev *dev)
 
        if (mt76_is_sdio(&dev->mt76)) {
                /* activate again */
-               ret = __mt7921_mcu_fw_pmctrl(dev);
+               ret = __mt792x_mcu_fw_pmctrl(dev);
                if (!ret)
-                       ret = __mt7921_mcu_drv_pmctrl(dev);
+                       ret = __mt792x_mcu_drv_pmctrl(dev);
        }
 
        ret = mt76_connac2_load_ram(&dev->mt76, mt7921_ram_name(dev), NULL);
@@ -953,7 +953,7 @@ int mt7921_mcu_drv_pmctrl(struct mt792x_dev *dev)
        if (!test_bit(MT76_STATE_PM, &mphy->state))
                goto out;
 
-       err = __mt7921_mcu_drv_pmctrl(dev);
+       err = __mt792x_mcu_drv_pmctrl(dev);
 out:
        mutex_unlock(&pm->mutex);
 
@@ -975,7 +975,7 @@ int mt7921_mcu_fw_pmctrl(struct mt792x_dev *dev)
        if (mt76_connac_skip_fw_pmctrl(mphy, pm))
                goto out;
 
-       err = __mt7921_mcu_fw_pmctrl(dev);
+       err = __mt792x_mcu_fw_pmctrl(dev);
 out:
        mutex_unlock(&pm->mutex);
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h b/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
index b797d8bab5e2329cc7788d45c80c48d6c3770cb7..86b8c98e3f6995d5ee6af1a8c344e7ecb9985509 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
@@ -159,12 +159,6 @@ enum mt7921_eeprom_field {
 
 #define MT_EE_HW_TYPE_ENCAP                    BIT(0)
 
-#define mt7921_init_reset(dev)         ((dev)->hif_ops->init_reset(dev))
-#define mt7921_dev_reset(dev)          ((dev)->hif_ops->reset(dev))
-#define mt7921_mcu_init(dev)           ((dev)->hif_ops->mcu_init(dev))
-#define __mt7921_mcu_drv_pmctrl(dev)   ((dev)->hif_ops->drv_own(dev))
-#define        __mt7921_mcu_fw_pmctrl(dev)     ((dev)->hif_ops->fw_own(dev))
-
 enum {
        TXPWR_USER,
        TXPWR_EEPROM,

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/pci.c b/drivers/net/wireless/mediatek/mt76/mt7921/pci.c
index d11406c87df7339a0cde5e1cc98740433538a724..7e9bb1879f9c5e70c70ebb0fe903119d6b85b385 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/pci.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/pci.c
@@ -46,7 +46,7 @@ static void mt7921e_unregister_device(struct mt792x_dev *dev)
        cancel_work_sync(&dev->reset_work);
 
        mt76_connac2_tx_token_put(&dev->mt76);
-       __mt7921_mcu_drv_pmctrl(dev);
+       __mt792x_mcu_drv_pmctrl(dev);
        mt792x_dma_cleanup(dev);
        mt792x_wfsys_reset(dev);
        skb_queue_purge(&dev->mt76.mcu.res_q);

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/testmode.c b/drivers/net/wireless/mediatek/mt76/mt7921/testmode.c
index 3c2165095ddd19f8b757418b536bf2c8de748205..e838d93477c194a430dbae06ecf8d3957502b66e 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/testmode.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/testmode.c
@@ -57,7 +57,7 @@ mt7921_tm_set(struct mt792x_dev *dev, struct mt7921_tm_cmd *req)
                pm->enable = false;
                cancel_delayed_work_sync(&pm->ps_work);
                cancel_work_sync(&pm->wake_work);
-               __mt7921_mcu_drv_pmctrl(dev);
+               __mt792x_mcu_drv_pmctrl(dev);
 
                phy->test.state = MT76_TM_STATE_ON;
        }

diff --git a/drivers/net/wireless/mediatek/mt76/mt792x.h b/drivers/net/wireless/mediatek/mt76/mt792x.h
index 894fb0fe8cba2272f4de0ccb54fb73b865b5459a..1c2829cd954d2d667b85df42966a6cc9469055c1 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt792x.h
+++ b/drivers/net/wireless/mediatek/mt76/mt792x.h
@@ -127,6 +127,12 @@ struct mt792x_irq_map {
        } rx;
 };
 
+#define mt792x_init_reset(dev)         ((dev)->hif_ops->init_reset(dev))
+#define mt792x_dev_reset(dev)          ((dev)->hif_ops->reset(dev))
+#define mt792x_mcu_init(dev)           ((dev)->hif_ops->mcu_init(dev))
+#define __mt792x_mcu_drv_pmctrl(dev)   ((dev)->hif_ops->drv_own(dev))
+#define        __mt792x_mcu_fw_pmctrl(dev)     ((dev)->hif_ops->fw_own(dev))
+
 struct mt792x_hif_ops {
        int (*init_reset)(struct mt792x_dev *dev);
        int (*reset)(struct mt792x_dev *dev);