Skip to contentSkip to conversation

mt7603: remove mt7603_mcu_init routine

PATCH Applied Lorenzo Bianconi 2 participants 2 messages Mar 16, 2019 1 message not in the archive

Subsystems (2)
Arm MediaTek MediaTek MT76 wireless LAN driver
lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Lorenzo Bianconi

author maintainer
#1 lore raw

PATCH 1/1 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 <[email protected]>
---
 drivers/net/wireless/mediatek/mt76/mt7603/init.c   |  2 +-
 drivers/net/wireless/mediatek/mt76/mt7603/mcu.c    | 10 +---------
 drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h |  2 +-
 3 files changed, 3 insertions(+), 11 deletions(-)
drivers/net/wireless/mediatek/mt76/mt7603/init.c +1 -1
index d54dda67d036..e17b6b89dfe2 100644
@@ -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;
drivers/net/wireless/mediatek/mt76/mt7603/mcu.c +1 -9
index d06905ea8cc6..57481012ee47 100644
@@ -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 @@ mt7603_load_firmware(struct mt7603_dev *dev)
 	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);
drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h +1 -1
index 8bd00b97066a..b65348ea4868 100644
@@ -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)
Signature · 1 line
2.20.1
maintainer Applied
#2 lore raw
Quoted 5 lines · Lorenzo Bianconi

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 <[email protected]>

Applied, thanks.

- Felix