Skip to content
Snippets Groups Projects
Commit 828111d3 authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Greg Kroah-Hartman
Browse files

mt76: mt7921: get rid of mcu_reset function pointer


commit d43b3257 upstream.

since mcu_reset it used only by mt7921, move the reset callback to
mt7921_mcu_parse_response routine and get rid of the function pointer.

Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
Link: https://lore.kernel.org/linux-wireless/364293ec8609dd254067d8173c1599526ffd662c.1619000828.git.lorenzo@kernel.org/


Signed-off-by: default avatarDeren Wu <deren.wu@mediatek.com>
Cc: <stable@vger.kernel.org> # 5.12: f92f81d3 mt76: mt7921: check mcu returned values in mt7921_start
Cc: <stable@vger.kernel.org> # 5.12: d32464e6 mt76: mt7921: introduce mt7921_run_firmware utility routine.
Cc: <stable@vger.kernel.org> # 5.12: 1f7396ac mt76: mt7921: introduce __mt7921_start utility routine
Cc: <stable@vger.kernel.org> # 5.12: 3990465d mt76: dma: introduce mt76_dma_queue_reset routine
Cc: <stable@vger.kernel.org> # 5.12: c001df97 mt76: dma: export mt76_dma_rx_cleanup routine
Cc: <stable@vger.kernel.org> # 5.12: 0c1ce988 mt76: mt7921: add wifi reset support
Cc: <stable@vger.kernel.org> # 5.12: e513ae49 mt76: mt7921: abort uncompleted scan by wifi reset
Cc: <stable@vger.kernel.org> # 5.12
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 356a5c7b
No related branches found
No related tags found
No related merge requests found
...@@ -161,6 +161,8 @@ mt7921_mcu_parse_response(struct mt76_dev *mdev, int cmd, ...@@ -161,6 +161,8 @@ mt7921_mcu_parse_response(struct mt76_dev *mdev, int cmd,
if (!skb) { if (!skb) {
dev_err(mdev->dev, "Message %d (seq %d) timeout\n", dev_err(mdev->dev, "Message %d (seq %d) timeout\n",
cmd, seq); cmd, seq);
mt7921_reset(mdev);
return -ETIMEDOUT; return -ETIMEDOUT;
} }
...@@ -952,7 +954,6 @@ int mt7921_mcu_init(struct mt7921_dev *dev) ...@@ -952,7 +954,6 @@ int mt7921_mcu_init(struct mt7921_dev *dev)
.mcu_skb_send_msg = mt7921_mcu_send_message, .mcu_skb_send_msg = mt7921_mcu_send_message,
.mcu_parse_response = mt7921_mcu_parse_response, .mcu_parse_response = mt7921_mcu_parse_response,
.mcu_restart = mt7921_mcu_restart, .mcu_restart = mt7921_mcu_restart,
.mcu_reset = mt7921_reset,
}; };
dev->mt76.mcu_ops = &mt7921_mcu_ops; dev->mt76.mcu_ops = &mt7921_mcu_ops;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment