Commit 047348fb authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Felix Fietkau
Browse files

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: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent eb9ca7ec

drivers/net/wireless/mediatek/mt76/mt7603/init.c

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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);

drivers/net/wireless/mediatek/mt76/mt7603/mt7603.h

+1 −1
Original line number Diff line number Diff line
@@ -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)

CRA Git | Maintained and supported by SUSTech CRA and CCSE