rt2800: move txstatus pending routine

Move rt2800usb_txstatus_pending routine to rt2800lib. It will be reused
by rt2800mmio code.

Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
index 635aa67295291eedd53bf01faeabb2204157dc13..e338b5d67a578948900a2107a4eb38770c6e19fe 100644 (file)
--- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
@@ -1183,6 +1183,23 @@ bool rt2800_txstatus_timeout(struct rt2x00_dev *rt2x00dev)
 }
 EXPORT_SYMBOL_GPL(rt2800_txstatus_timeout);
 
+/*
+ * test if there is an entry in any TX queue for which DMA is done
+ * but the TX status has not been returned yet
+ */
+bool rt2800_txstatus_pending(struct rt2x00_dev *rt2x00dev)
+{
+       struct data_queue *queue;
+
+       tx_queue_for_each(rt2x00dev, queue) {
+               if (rt2x00queue_get_entry(queue, Q_INDEX_DMA_DONE) !=
+                   rt2x00queue_get_entry(queue, Q_INDEX_DONE))
+                       return true;
+       }
+       return false;
+}
+EXPORT_SYMBOL_GPL(rt2800_txstatus_pending);
+
 void rt2800_txdone_nostatus(struct rt2x00_dev *rt2x00dev)
 {
        struct data_queue *queue;

diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.h b/drivers/net/wireless/ralink/rt2x00/rt2800lib.h
index 506c319070dd839493bbf395ec2076e3290f7713..759eab2b70c3062ea7f8b1d08bc874efeb1b0690 100644 (file)
--- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.h
+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.h
@@ -198,6 +198,7 @@ void rt2800_txdone_entry(struct queue_entry *entry, u32 status, __le32 *txwi,
 void rt2800_txdone(struct rt2x00_dev *rt2x00dev, unsigned int quota);
 void rt2800_txdone_nostatus(struct rt2x00_dev *rt2x00dev);
 bool rt2800_txstatus_timeout(struct rt2x00_dev *rt2x00dev);
+bool rt2800_txstatus_pending(struct rt2x00_dev *rt2x00dev);
 
 void rt2800_write_beacon(struct queue_entry *entry, struct txentry_desc *txdesc);
 void rt2800_clear_beacon(struct queue_entry *entry);

diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800usb.c b/drivers/net/wireless/ralink/rt2x00/rt2800usb.c
index 9d1e73b642a83db454bfd0cd056191566a7b88e4..b5f75df9b563c5a2bf81190598ebbce277e6054c 100644 (file)
--- a/drivers/net/wireless/ralink/rt2x00/rt2800usb.c
+++ b/drivers/net/wireless/ralink/rt2x00/rt2800usb.c
@@ -100,22 +100,6 @@ static void rt2800usb_stop_queue(struct data_queue *queue)
        }
 }
 
-/*
- * test if there is an entry in any TX queue for which DMA is done
- * but the TX status has not been returned yet
- */
-static bool rt2800usb_txstatus_pending(struct rt2x00_dev *rt2x00dev)
-{
-       struct data_queue *queue;
-
-       tx_queue_for_each(rt2x00dev, queue) {
-               if (rt2x00queue_get_entry(queue, Q_INDEX_DMA_DONE) !=
-                   rt2x00queue_get_entry(queue, Q_INDEX_DONE))
-                       return true;
-       }
-       return false;
-}
-
 #define TXSTATUS_READ_INTERVAL 1000000
 
 static bool rt2800usb_tx_sta_fifo_read_completed(struct rt2x00_dev *rt2x00dev,
@@ -145,7 +129,7 @@ static bool rt2800usb_tx_sta_fifo_read_completed(struct rt2x00_dev *rt2x00dev,
        if (rt2800_txstatus_timeout(rt2x00dev))
                queue_work(rt2x00dev->workqueue, &rt2x00dev->txdone_work);
 
-       if (rt2800usb_txstatus_pending(rt2x00dev)) {
+       if (rt2800_txstatus_pending(rt2x00dev)) {
                /* Read register after 1 ms */
                hrtimer_start(&rt2x00dev->txstatus_timer,
                              TXSTATUS_READ_INTERVAL,
@@ -160,7 +144,7 @@ stop_reading:
         * clear_bit someone could do rt2x00usb_interrupt_txdone, so recheck
         * here again if status reading is needed.
         */
-       if (rt2800usb_txstatus_pending(rt2x00dev) &&
+       if (rt2800_txstatus_pending(rt2x00dev) &&
            !test_and_set_bit(TX_STATUS_READING, &rt2x00dev->flags))
                return true;
        else
@@ -489,7 +473,7 @@ static void rt2800usb_work_txdone(struct work_struct *work)
                 * if the medium is busy, thus the TX_STA_FIFO entry is
                 * also delayed -> use a timer to retrieve it.
                 */
-               if (rt2800usb_txstatus_pending(rt2x00dev))
+               if (rt2800_txstatus_pending(rt2x00dev))
                        rt2800usb_async_read_tx_status(rt2x00dev);
        }
 }