]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
mt76: mt7603: run __mt76_mcu_send_msg in mt7603_mcu_send_firmware
authorLorenzo Bianconi <lorenzo@kernel.org>
Thu, 18 Apr 2019 14:32:00 +0000 (16:32 +0200)
committerFelix Fietkau <nbd@nbd.name>
Wed, 1 May 2019 11:04:00 +0000 (13:04 +0200)
Run __mt76_mcu_send_msg instead of __mt7603_mcu_msg_send and remove
duplicated code.

Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
drivers/net/wireless/mediatek/mt76/mt7603/mcu.c

index 7ebfcb021d40e5ca79abf7ba59a1604305809e43..ca08b546fa0ae2b283dbfc04d84b85f7c17f69db 100644 (file)
@@ -122,19 +122,14 @@ mt7603_mcu_init_download(struct mt7603_dev *dev, u32 addr, u32 len)
 static int
 mt7603_mcu_send_firmware(struct mt7603_dev *dev, const void *data, int len)
 {
-       struct sk_buff *skb;
-       int ret = 0;
+       int cur_len, ret = 0;
 
        while (len > 0) {
-               int cur_len = min_t(int, 4096 - sizeof(struct mt7603_mcu_txd),
-                                   len);
-
-               skb = mt7603_mcu_msg_alloc(data, cur_len);
-               if (!skb)
-                       return -ENOMEM;
+               cur_len = min_t(int, 4096 - sizeof(struct mt7603_mcu_txd),
+                               len);
 
-               ret = __mt7603_mcu_msg_send(dev, skb, -MCU_CMD_FW_SCATTER,
-                                           NULL);
+               ret = __mt76_mcu_send_msg(&dev->mt76, -MCU_CMD_FW_SCATTER,
+                                         data, cur_len, false);
                if (ret)
                        break;