Commit 8e4edae2 authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Felix Fietkau
Browse files

wifi: mt76: mt7615: avoid mcu_restart function pointer 



Run mt7615_mcu_restart routine directly and avoid mcu_restart function
pointer whenever it is possible.

Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent a71ace35

drivers/net/wireless/mediatek/mt76/mt7615/mcu.c

+1 −2
Original line number Diff line number Diff line
@@ -1692,7 +1692,6 @@ int mt7615_mcu_init(struct mt7615_dev *dev) 
		.headroom = sizeof(struct mt7615_mcu_txd),

		.mcu_skb_send_msg = mt7615_mcu_send_message,

		.mcu_parse_response = mt7615_mcu_parse_response,

		.mcu_restart = mt7615_mcu_restart,

	};

	int ret;
@@ -1732,7 +1731,7 @@ EXPORT_SYMBOL_GPL(mt7615_mcu_init); 


void mt7615_mcu_exit(struct mt7615_dev *dev)

{

	__mt76_mcu_restart(&dev->mt76);

	mt7615_mcu_restart(&dev->mt76);

	mt7615_mcu_set_fw_ctrl(dev);

	skb_queue_purge(&dev->mt76.mcu.res_q);

}

drivers/net/wireless/mediatek/mt76/mt7615/sdio_mcu.c

+0 −1
Original line number Diff line number Diff line
@@ -137,7 +137,6 @@ int mt7663s_mcu_init(struct mt7615_dev *dev) 
		.tailroom = MT_USB_TAIL_SIZE,

		.mcu_skb_send_msg = mt7663s_mcu_send_message,

		.mcu_parse_response = mt7615_mcu_parse_response,

		.mcu_restart = mt7615_mcu_restart,

		.mcu_rr = mt76_connac_mcu_reg_rr,

		.mcu_wr = mt76_connac_mcu_reg_wr,

	};

drivers/net/wireless/mediatek/mt76/mt7615/usb_mcu.c

+0 −1
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ int mt7663u_mcu_init(struct mt7615_dev *dev) 
		.tailroom = MT_USB_TAIL_SIZE,

		.mcu_skb_send_msg = mt7663u_mcu_send_message,

		.mcu_parse_response = mt7615_mcu_parse_response,

		.mcu_restart = mt7615_mcu_restart,

	};

	int ret;