wifi: mt76: mt7615: avoid mcu_restart function pointer

Run mt7615_mcu_restart routine directly and avoid mcu_restart function
pointer whenever it is possible.

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
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 83f30305414d33105e1fa8c38b2ce3e156e5aee5..eea398c79a9849be8af5b07c5fe9bb3c289c2213 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c
@@ -1692,7 +1692,6 @@ int mt7615_mcu_init(struct mt7615_dev *dev)
                .headroom = sizeof(struct mt7615_mcu_txd),
                .mcu_skb_send_msg = mt7615_mcu_send_message,
                .mcu_parse_response = mt7615_mcu_parse_response,
-               .mcu_restart = mt7615_mcu_restart,
        };
        int ret;
 
@@ -1732,7 +1731,7 @@ EXPORT_SYMBOL_GPL(mt7615_mcu_init);
 
 void mt7615_mcu_exit(struct mt7615_dev *dev)
 {
-       __mt76_mcu_restart(&dev->mt76);
+       mt7615_mcu_restart(&dev->mt76);
        mt7615_mcu_set_fw_ctrl(dev);
        skb_queue_purge(&dev->mt76.mcu.res_q);
 }

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/sdio_mcu.c b/drivers/net/wireless/mediatek/mt76/mt7615/sdio_mcu.c
index dc9a2f0b45a52894f5bde84c3fad9142d3b0de1e..b0094205ba95c9e515d2ffca921569577622423f 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/sdio_mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/sdio_mcu.c
@@ -137,7 +137,6 @@ int mt7663s_mcu_init(struct mt7615_dev *dev)
                .tailroom = MT_USB_TAIL_SIZE,
                .mcu_skb_send_msg = mt7663s_mcu_send_message,
                .mcu_parse_response = mt7615_mcu_parse_response,
-               .mcu_restart = mt7615_mcu_restart,
                .mcu_rr = mt76_connac_mcu_reg_rr,
                .mcu_wr = mt76_connac_mcu_reg_wr,
        };

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/usb_mcu.c b/drivers/net/wireless/mediatek/mt76/mt7615/usb_mcu.c
index 98bf2f6ae9362812727d1fc908107e203075c14a..a8b1a0f8b2d7c65dad659089daca2179cc0d187e 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/usb_mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/usb_mcu.c
@@ -69,7 +69,6 @@ int mt7663u_mcu_init(struct mt7615_dev *dev)
                .tailroom = MT_USB_TAIL_SIZE,
                .mcu_skb_send_msg = mt7663u_mcu_send_message,
                .mcu_parse_response = mt7615_mcu_parse_response,
-               .mcu_restart = mt7615_mcu_restart,
        };
        int ret;