mt76: mt76_connac: move WoW and suspend code in mt76_connac_mcu module

[platform/kernel/linux-starfive.git] / drivers / net / wireless / mediatek / mt76 / mt7615 / usb.c

diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/usb.c b/drivers/net/wireless/mediatek/mt76/mt7615/usb.c
index a60cfa3..0396ad5 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7615/usb.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7615/usb.c
@@ -29,7 +29,7 @@ static void mt7663u_stop(struct ieee80211_hw *hw)
        del_timer_sync(&phy->roc_timer);
        cancel_work_sync(&phy->roc_work);
        cancel_delayed_work_sync(&phy->scan_work);
-       cancel_delayed_work_sync(&phy->mac_work);
+       cancel_delayed_work_sync(&phy->mt76->mac_work);
        mt76u_stop_tx(&dev->mt76);
 }
 
@@ -47,11 +47,7 @@ static void mt7663u_init_work(struct work_struct *work)
        if (mt7663u_mcu_init(dev))
                return;
 
-       mt7615_mcu_set_eeprom(dev);
-       mt7615_mac_init(dev);
-       mt7615_phy_init(dev);
-       mt7615_mcu_del_wtbl_all(dev);
-       mt7615_check_offload_capability(dev);
+       mt7615_init_work(dev);
 }
 
 static int mt7663u_probe(struct usb_interface *usb_intf,
@@ -173,7 +169,7 @@ static int mt7663u_suspend(struct usb_interface *intf, pm_message_t state)
            mt7615_firmware_offload(dev)) {
                int err;
 
-               err = mt7615_mcu_set_hif_suspend(dev, true);
+               err = mt76_connac_mcu_set_hif_suspend(&dev->mt76, true);
                if (err < 0)
                        return err;
        }
@@ -201,7 +197,7 @@ static int mt7663u_resume(struct usb_interface *intf)
 
        if (!test_bit(MT76_STATE_SUSPEND, &dev->mphy.state) &&
            mt7615_firmware_offload(dev))
-               err = mt7615_mcu_set_hif_suspend(dev, false);
+               err = mt76_connac_mcu_set_hif_suspend(&dev->mt76, false);
 
        return err;
 }