mt76: mt7915: rely on mt76_connac_mcu_start_firmware
authorLorenzo Bianconi <lorenzo@kernel.org>
Fri, 24 Dec 2021 10:58:05 +0000 (11:58 +0100)
committerFelix Fietkau <nbd@nbd.name>
Thu, 3 Feb 2022 12:57:58 +0000 (13:57 +0100)
Rely on mt76_connac_mcu_start_firmware and remove duplicated code.

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
drivers/net/wireless/mediatek/mt76/mt7915/mcu.c

index b8640422d475ad9a0bb63152794e30cbcb459e09..f5d24e03a86110463d7265273e86ab5131696ff3 100644 (file)
@@ -1941,21 +1941,6 @@ out:
                                     MCU_EXT_CMD(BSS_INFO_UPDATE), true);
 }
 
-static int mt7915_mcu_start_firmware(struct mt7915_dev *dev, u32 addr,
-                                    u32 option)
-{
-       struct {
-               __le32 option;
-               __le32 addr;
-       } req = {
-               .option = cpu_to_le32(option),
-               .addr = cpu_to_le32(addr),
-       };
-
-       return mt76_mcu_send_msg(&dev->mt76, MCU_CMD(FW_START_REQ), &req,
-                                sizeof(req), true);
-}
-
 static int mt7915_mcu_restart(struct mt76_dev *dev)
 {
        struct {
@@ -2175,7 +2160,7 @@ mt7915_mcu_send_ram_firmware(struct mt7915_dev *dev,
        if (is_wa)
                option |= FW_START_WORKING_PDA_CR4;
 
-       return mt7915_mcu_start_firmware(dev, override, option);
+       return mt76_connac_mcu_start_firmware(&dev->mt76, override, option);
 }
 
 static int mt7915_load_ram(struct mt7915_dev *dev)