mt7603: remove mt7603_mcu_init routine

Remove mt7603_mcu_init since mcu.mutex has been already initialized
in mt76_mmio_init. Run mt7603_load_firmware directly in
mt7603_init_hardware

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

diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/init.c b/drivers/net/wireless/mediatek/mt76/mt7603/init.c
index 3af45949e868909e3073335cc302411c5e6c9761..67b05b6512388fdcf1d1a59c3c39485039858ada 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7603/init.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7603/init.c
@@ -282,7 +282,7 @@ mt7603_init_hardware(struct mt7603_dev *dev)
                mt76_poll(dev, MT_PSE_RTA, MT_PSE_RTA_BUSY, 0, 5000);
        }
 
-       ret = mt7603_mcu_init(dev);
+       ret = mt7603_load_firmware(dev);
        if (ret)
                return ret;
 

diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7603/mcu.c
index d06905ea8cc63f2b9851eb679655007c1e8f7486..57481012ee47bef5abfcb255f4bda21024c9146a 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7603/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7603/mcu.c
@@ -170,8 +170,7 @@ mt7603_mcu_restart(struct mt7603_dev *dev)
                                   MCU_Q_NA);
 }
 
-static int
-mt7603_load_firmware(struct mt7603_dev *dev)
+int mt7603_load_firmware(struct mt7603_dev *dev)
 {
        const struct firmware *fw;
        const struct mt7603_fw_trailer *hdr;
@@ -269,13 +268,6 @@ out:
        return ret;
 }
 
-int mt7603_mcu_init(struct mt7603_dev *dev)
-{
-       mutex_init(&dev->mt76.mmio.mcu.mutex);
-
-       return mt7603_load_firmware(dev);
-}
-
 void mt7603_mcu_exit(struct mt7603_dev *dev)
 {
        mt7603_mcu_restart(dev);

diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h b/drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h
index 9f58d1036eccc83066a43d31843b7b924b34014e..c355e36966dd825a437eb109543892faa18dcee7 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h
+++ b/drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h
@@ -176,7 +176,7 @@ void mt7603_unregister_device(struct mt7603_dev *dev);
 int mt7603_eeprom_init(struct mt7603_dev *dev);
 int mt7603_dma_init(struct mt7603_dev *dev);
 void mt7603_dma_cleanup(struct mt7603_dev *dev);
-int mt7603_mcu_init(struct mt7603_dev *dev);
+int mt7603_load_firmware(struct mt7603_dev *dev);
 void mt7603_init_debugfs(struct mt7603_dev *dev);
 
 static inline void mt7603_irq_enable(struct mt7603_dev *dev, u32 mask)