Commit d43b3257 authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Felix Fietkau

mt76: mt7921: get rid of mcu_reset function pointer

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>
parent 422f3511
...@@ -99,10 +99,6 @@ int mt76_mcu_skb_send_and_get_msg(struct mt76_dev *dev, struct sk_buff *skb, ...@@ -99,10 +99,6 @@ int mt76_mcu_skb_send_and_get_msg(struct mt76_dev *dev, struct sk_buff *skb,
dev_kfree_skb(skb); dev_kfree_skb(skb);
} while (ret == -EAGAIN); } while (ret == -EAGAIN);
/* notify driver code to reset the mcu */
if (ret == -ETIMEDOUT && dev->mcu_ops->mcu_reset)
dev->mcu_ops->mcu_reset(dev);
out: out:
mutex_unlock(&dev->mcu.mutex); mutex_unlock(&dev->mcu.mutex);
......
...@@ -168,7 +168,6 @@ struct mt76_mcu_ops { ...@@ -168,7 +168,6 @@ struct mt76_mcu_ops {
int (*mcu_rd_rp)(struct mt76_dev *dev, u32 base, int (*mcu_rd_rp)(struct mt76_dev *dev, u32 base,
struct mt76_reg_pair *rp, int len); struct mt76_reg_pair *rp, int len);
int (*mcu_restart)(struct mt76_dev *dev); int (*mcu_restart)(struct mt76_dev *dev);
void (*mcu_reset)(struct mt76_dev *dev);
}; };
struct mt76_queue_ops { struct mt76_queue_ops {
......
...@@ -162,6 +162,8 @@ mt7921_mcu_parse_response(struct mt76_dev *mdev, int cmd, ...@@ -162,6 +162,8 @@ mt7921_mcu_parse_response(struct mt76_dev *mdev, int cmd,
if (!skb) { if (!skb) {
dev_err(mdev->dev, "Message %08x (seq %d) timeout\n", dev_err(mdev->dev, "Message %08x (seq %d) timeout\n",
cmd, seq); cmd, seq);
mt7921_reset(mdev);
return -ETIMEDOUT; return -ETIMEDOUT;
} }
...@@ -974,7 +976,6 @@ int mt7921_mcu_init(struct mt7921_dev *dev) ...@@ -974,7 +976,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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment