mt76: introduce mt76_mcu_restart macro

Use common function wrapper in mt76x02_watchdog_reset

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.h b/drivers/net/wireless/mediatek/mt76/mt76.h
index 8fd314a7d216c01361991d782d0e8edc8aef66b2..e200c81a1bdedad305b49fcf6ee92ef6581ef73b 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76.h
+++ b/drivers/net/wireless/mediatek/mt76/mt76.h
@@ -544,6 +544,8 @@ struct mt76_rx_status {
 
 #define mt76_mcu_send_msg(dev, ...)    (dev)->mt76.mcu_ops->mcu_send_msg(&((dev)->mt76), __VA_ARGS__)
 #define __mt76_mcu_send_msg(dev, ...)  (dev)->mcu_ops->mcu_send_msg((dev), __VA_ARGS__)
+#define mt76_mcu_restart(dev, ...)     (dev)->mt76.mcu_ops->mcu_restart(&((dev)->mt76))
+#define __mt76_mcu_restart(dev, ...)   (dev)->mcu_ops->mcu_restart((dev))
 
 #define mt76_set(dev, offset, val)     mt76_rmw(dev, offset, 0, val)
 #define mt76_clear(dev, offset, val)   mt76_rmw(dev, offset, val, 0)

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c b/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c
index 5bc1b901f8971b512ee852c145a388a867a1b26f..235ae9756aa022585eef0e7fca4c9d10b07e8e97 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c
@@ -480,7 +480,7 @@ static void mt76x02_watchdog_reset(struct mt76x02_dev *dev)
        mt76_set(dev, 0x734, 0x3);
 
        if (restart)
-               dev->mt76.mcu_ops->mcu_restart(&dev->mt76);
+               mt76_mcu_restart(dev);
 
        for (i = 0; i < ARRAY_SIZE(dev->mt76.q_tx); i++)
                mt76_queue_tx_cleanup(dev, i, true);