mt76: connac: move mt76_connac_mcu_restart in common module

Move mt76_connac_mcu_restart routine in mt76-connac since it is shared
between mt7921 and mt7915.

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
index 6b714928d70a21f9abed10671d8cd820a73f4ff4..efd0519a1872af249550b07eb2f822b44dd12c42 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.c
@@ -2750,5 +2750,19 @@ int mt76_connac_mcu_set_pm(struct mt76_dev *dev, int band, int enter)
 }
 EXPORT_SYMBOL_GPL(mt76_connac_mcu_set_pm);
 
+int mt76_connac_mcu_restart(struct mt76_dev *dev)
+{
+       struct {
+               u8 power_mode;
+               u8 rsv[3];
+       } req = {
+               .power_mode = 1,
+       };
+
+       return mt76_mcu_send_msg(dev, MCU_CMD(NIC_POWER_CTRL), &req,
+                                sizeof(req), false);
+}
+EXPORT_SYMBOL_GPL(mt76_connac_mcu_restart);
+
 MODULE_AUTHOR("Lorenzo Bianconi <lorenzo@kernel.org>");
 MODULE_LICENSE("Dual BSD/GPL");

diff --git a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
index 285c6529474dc46cb1551fa3e0384c830effdf48..0dd02d79a297b7d48d8b150d20fcfd75a4c4dbc6 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76_connac_mcu.h
@@ -1610,4 +1610,5 @@ void mt76_connac_mcu_wtbl_smps_tlv(struct sk_buff *skb,
                                   struct ieee80211_sta *sta,
                                   void *sta_wtbl, void *wtbl_tlv);
 int mt76_connac_mcu_set_pm(struct mt76_dev *dev, int band, int enter);
+int mt76_connac_mcu_restart(struct mt76_dev *dev);
 #endif /* __MT76_CONNAC_MCU_H */

diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
index f5d24e03a86110463d7265273e86ab5131696ff3..77fa79ca8719aa10a337b4fb5fe30415f09cbeb8 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c
@@ -1941,19 +1941,6 @@ out:
                                     MCU_EXT_CMD(BSS_INFO_UPDATE), true);
 }
 
-static int mt7915_mcu_restart(struct mt76_dev *dev)
-{
-       struct {
-               u8 power_mode;
-               u8 rsv[3];
-       } req = {
-               .power_mode = 1,
-       };
-
-       return mt76_mcu_send_msg(dev, MCU_CMD(NIC_POWER_CTRL), &req,
-                                sizeof(req), false);
-}
-
 static int mt7915_mcu_patch_sem_ctrl(struct mt7915_dev *dev, bool get)
 {
        struct {
@@ -2428,7 +2415,7 @@ int mt7915_mcu_init(struct mt7915_dev *dev)
                .headroom = sizeof(struct mt7915_mcu_txd),
                .mcu_skb_send_msg = mt7915_mcu_send_message,
                .mcu_parse_response = mt7915_mcu_parse_response,
-               .mcu_restart = mt7915_mcu_restart,
+               .mcu_restart = mt76_connac_mcu_restart,
        };
        int ret;
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
index 7ca1e2291674998670a697abf9a96310170b7ad1..fa6c0d8d3b225990a8fa8bf453f82c0f498c66e9 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
@@ -444,20 +444,6 @@ int mt7921_mcu_uni_rx_ba(struct mt7921_dev *dev,
                                      enable, false);
 }
 
-int mt7921_mcu_restart(struct mt76_dev *dev)
-{
-       struct {
-               u8 power_mode;
-               u8 rsv[3];
-       } req = {
-               .power_mode = 1,
-       };
-
-       return mt76_mcu_send_msg(dev, MCU_CMD(NIC_POWER_CTRL), &req,
-                                sizeof(req), false);
-}
-EXPORT_SYMBOL_GPL(mt7921_mcu_restart);
-
 static u32 mt7921_get_data_mode(struct mt7921_dev *dev, u32 info)
 {
        u32 mode = DL_MODE_NEED_RSP;

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h b/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
index f9c0fd7ca073ceac45e85dc6716d273c62025253..fd93317839317df6a24abc92254c3f8762f14c58 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h
@@ -433,7 +433,6 @@ int mt7921_mcu_fill_message(struct mt76_dev *mdev, struct sk_buff *skb,
                            int cmd, int *wait_seq);
 int mt7921_mcu_parse_response(struct mt76_dev *mdev, int cmd,
                              struct sk_buff *skb, int seq);
-int mt7921_mcu_restart(struct mt76_dev *dev);
 
 void mt7921e_queue_rx_skb(struct mt76_dev *mdev, enum mt76_rxq_id q,
                          struct sk_buff *skb);

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/pci_mcu.c b/drivers/net/wireless/mediatek/mt76/mt7921/pci_mcu.c
index a020352122a12f9696844952b30b211aaafe9f78..f9e350b67fdc13e90e13120168c8c9f3b4b8d0bb 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/pci_mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/pci_mcu.c
@@ -42,7 +42,7 @@ int mt7921e_mcu_init(struct mt7921_dev *dev)
                .headroom = sizeof(struct mt7921_mcu_txd),
                .mcu_skb_send_msg = mt7921_mcu_send_message,
                .mcu_parse_response = mt7921_mcu_parse_response,
-               .mcu_restart = mt7921_mcu_restart,
+               .mcu_restart = mt76_connac_mcu_restart,
        };
        int err;