mt76: mt7921: rework mt7921_mcu_debug_msg_event routine

Rework mt7921_mcu_debug_msg_event routing removing unnecessary
assignments and relying on wiphy_info

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
index 98b48b26a6fe250f91f762b01d6bfdb7f8f8ddb2..9283f9865ad5e6c9c599a77df49100ca192b90c1 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
+++ b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c
@@ -474,29 +474,27 @@ mt7921_mcu_bss_event(struct mt7921_dev *dev, struct sk_buff *skb)
 static void
 mt7921_mcu_debug_msg_event(struct mt7921_dev *dev, struct sk_buff *skb)
 {
-       struct mt7921_mcu_rxd *rxd = (struct mt7921_mcu_rxd *)skb->data;
-       struct debug_msg {
+       struct mt7921_debug_msg {
                __le16 id;
                u8 type;
                u8 flag;
                __le32 value;
                __le16 len;
                u8 content[512];
-       } __packed * debug_msg;
-       u16 cur_len;
-       int i;
-
-       skb_pull(skb, sizeof(*rxd));
-       debug_msg = (struct debug_msg *)skb->data;
+       } __packed * msg;
 
-       cur_len = min_t(u16, le16_to_cpu(debug_msg->len), 512);
+       skb_pull(skb, sizeof(struct mt7921_mcu_rxd));
+       msg = (struct mt7921_debug_msg *)skb->data;
 
-       if (debug_msg->type == 0x3) {
-               for (i = 0 ; i < cur_len; i++)
-                       if (!debug_msg->content[i])
-                               debug_msg->content[i] = ' ';
+       if (msg->type == 3) { /* fw log */
+               u16 len = min_t(u16, le16_to_cpu(msg->len), 512);
+               int i;
 
-               dev_dbg(dev->mt76.dev, "%s", debug_msg->content);
+               for (i = 0 ; i < len; i++) {
+                       if (!msg->content[i])
+                               msg->content[i] = ' ';
+               }
+               wiphy_info(mt76_hw(dev)->wiphy, "%*s", len, msg->content);
        }
 }