From 11ab62057e9b7e2edd4656b09c100df4ea9dbd08 Mon Sep 17 00:00:00 2001
From: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
Date: Wed, 6 Feb 2019 10:20:09 +0100
Subject: [PATCH] mt7603: rely on mt76_tx_queue_skb_raw common routine

Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@redhat.com>
---
 mt7603/dma.c    | 23 -----------------------
 mt7603/main.c   |  3 ++-
 mt7603/mcu.c    |  2 +-
 mt7603/mt7603.h |  2 --
 4 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/mt7603/dma.c b/mt7603/dma.c
index 0ea9a090..d69e82c6 100644
--- a/mt7603/dma.c
+++ b/mt7603/dma.c
@@ -4,29 +4,6 @@
 #include "mac.h"
 #include "../dma.h"
 
-int
-mt7603_tx_queue_mcu(struct mt7603_dev *dev, enum mt76_txq_id qid,
-		    struct sk_buff *skb)
-{
-	struct mt76_queue *q = &dev->mt76.q_tx[qid];
-	struct mt76_queue_buf buf;
-	dma_addr_t addr;
-
-	addr = dma_map_single(dev->mt76.dev, skb->data, skb->len,
-			      DMA_TO_DEVICE);
-	if (dma_mapping_error(dev->mt76.dev, addr))
-		return -ENOMEM;
-
-	buf.addr = addr;
-	buf.len = skb->len;
-	spin_lock_bh(&q->lock);
-	mt76_queue_add_buf(dev, q, &buf, 1, 0, skb, NULL);
-	mt76_queue_kick(dev, q);
-	spin_unlock_bh(&q->lock);
-
-	return 0;
-}
-
 static int
 mt7603_init_tx_queue(struct mt7603_dev *dev, struct mt76_queue *q,
 		     int idx, int n_desc)
diff --git a/mt7603/main.c b/mt7603/main.c
index cf1a5e44..b10775ed 100644
--- a/mt7603/main.c
+++ b/mt7603/main.c
@@ -360,7 +360,8 @@ mt7603_ps_tx_list(struct mt7603_dev *dev, struct sk_buff_head *list)
 	struct sk_buff *skb;
 
 	while ((skb = __skb_dequeue(list)) != NULL)
-		mt7603_tx_queue_mcu(dev, skb_get_queue_mapping(skb), skb);
+		mt76_tx_queue_skb_raw(dev, skb_get_queue_mapping(skb),
+				      skb, 0);
 }
 
 void
diff --git a/mt7603/mcu.c b/mt7603/mcu.c
index beff71ec..4b0713f1 100644
--- a/mt7603/mcu.c
+++ b/mt7603/mcu.c
@@ -54,7 +54,7 @@ __mt7603_mcu_msg_send(struct mt7603_dev *dev, struct sk_buff *skb, int cmd,
 	if (wait_seq)
 		*wait_seq = seq;
 
-	return mt7603_tx_queue_mcu(dev, MT_TXQ_MCU, skb);
+	return mt76_tx_queue_skb_raw(dev, MT_TXQ_MCU, skb, 0);
 }
 
 static int
diff --git a/mt7603/mt7603.h b/mt7603/mt7603.h
index 9c334261..6de16fa2 100644
--- a/mt7603/mt7603.h
+++ b/mt7603/mt7603.h
@@ -177,8 +177,6 @@ int mt7603_eeprom_init(struct mt7603_dev *dev);
 int mt7603_dma_init(struct mt7603_dev *dev);
 void mt7603_dma_cleanup(struct mt7603_dev *dev);
 int mt7603_mcu_init(struct mt7603_dev *dev);
-int mt7603_tx_queue_mcu(struct mt7603_dev *dev, enum mt76_txq_id qid,
-			struct sk_buff *skb);
 void mt7603_init_debugfs(struct mt7603_dev *dev);
 
 void mt7603_set_irq_mask(struct mt7603_dev *dev, u32 clear, u32 set);