mt76: mt7663s: rely on mcu reg access utility

rely on mcu reg access utility and drop the duplicated code.

Acked-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Sean Wang <sean.wang@mediatek.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
index 2ba730808f3b2aa5cf165f9f39b24dd72d2f050f..2cb3969e6432b996c7cf83d9020c67cb2ec24be1 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
@@ -2769,31 +2769,3 @@ int mt7615_mcu_set_roc(struct mt7615_phy *phy, struct ieee80211_vif *vif,
        return mt76_mcu_send_msg(&dev->mt76, MCU_CMD_SET_ROC, &req,
                                 sizeof(req), false);
 }
-
-u32 mt7615_mcu_reg_rr(struct mt76_dev *dev, u32 offset)
-{
-       struct {
-               __le32 addr;
-               __le32 val;
-       } __packed req = {
-               .addr = cpu_to_le32(offset),
-       };
-
-       return mt76_mcu_send_msg(dev, MCU_CMD_REG_READ, &req, sizeof(req),
-                                true);
-}
-EXPORT_SYMBOL_GPL(mt7615_mcu_reg_rr);
-
-void mt7615_mcu_reg_wr(struct mt76_dev *dev, u32 offset, u32 val)
-{
-       struct {
-               __le32 addr;
-               __le32 val;
-       } __packed req = {
-               .addr = cpu_to_le32(offset),
-               .val = cpu_to_le32(val),
-       };
-
-       mt76_mcu_send_msg(dev, MCU_CMD_REG_WRITE, &req, sizeof(req), false);
-}
-EXPORT_SYMBOL_GPL(mt7615_mcu_reg_wr);

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h b/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h
index 58a98b5c0cbca651d09059a8594b636c4999ea62..437f14f06e63c6566609151ded153efd805ab64e 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h
@@ -553,8 +553,6 @@ int mt7615_mac_set_beacon_filter(struct mt7615_phy *phy,
 int mt7615_mcu_set_bss_pm(struct mt7615_dev *dev, struct ieee80211_vif *vif,
                          bool enable);
 int __mt7663_load_firmware(struct mt7615_dev *dev);
-u32 mt7615_mcu_reg_rr(struct mt76_dev *dev, u32 offset);
-void mt7615_mcu_reg_wr(struct mt76_dev *dev, u32 offset, u32 val);
 void mt7615_coredump_work(struct work_struct *work);
 
 void mt7622_trigger_hif_int(struct mt7615_dev *dev, bool en);

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/sdio_mcu.c b/drivers/net/wireless/mediatek/mt76/mt7615/sdio_mcu.c
index 45c1cd3b9f49897facc6df595ecefd4cc8e4e354..517419bb77720a4a26c5eb6bacca120fb3833a1a 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/sdio_mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/sdio_mcu.c
@@ -137,8 +137,8 @@ int mt7663s_mcu_init(struct mt7615_dev *dev)
                .mcu_skb_send_msg = mt7663s_mcu_send_message,
                .mcu_parse_response = mt7615_mcu_parse_response,
                .mcu_restart = mt7615_mcu_restart,
-               .mcu_rr = mt7615_mcu_reg_rr,
-               .mcu_wr = mt7615_mcu_reg_wr,
+               .mcu_rr = mt76_connac_mcu_reg_rr,
+               .mcu_wr = mt76_connac_mcu_reg_wr,
        };
        struct mt7615_mcu_ops *mcu_ops;
        int ret;