1 files changed, 5 insertions, 27 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c
index e9f4261054bc..d7752dbd2023 100644
--- a/drivers/net/wireless/rt2x00/rt2x00queue.c
+++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
@@ -319,8 +319,8 @@ static void rt2x00queue_create_tx_descriptor(struct queue_entry *entry,
                 /*
                  * Convert length to microseconds.
                  */
-                residual = get_duration_res(data_length, hwrate->bitrate);
-                duration = get_duration(data_length, hwrate->bitrate);
+                residual = GET_DURATION_RES(data_length, hwrate->bitrate);
+                duration = GET_DURATION(data_length, hwrate->bitrate);
 
                 if (residual != 0) {
                         duration++;
@@ -589,40 +589,18 @@ static void rt2x00queue_reset(struct data_queue *queue)
         spin_unlock_irqrestore(&queue->lock, irqflags);
 }
 
-void rt2x00queue_init_rx(struct rt2x00_dev *rt2x00dev)
-{
-        struct data_queue *queue = rt2x00dev->rx;
-        unsigned int i;
-
-        rt2x00queue_reset(queue);
-
-        if (!rt2x00dev->ops->lib->init_rxentry)
-                return;
-
-        for (i = 0; i < queue->limit; i++) {
-                queue->entries[i].flags = 0;
-
-                rt2x00dev->ops->lib->init_rxentry(rt2x00dev,
-                                                  &queue->entries[i]);
-        }
-}
-
-void rt2x00queue_init_tx(struct rt2x00_dev *rt2x00dev)
+void rt2x00queue_init_queues(struct rt2x00_dev *rt2x00dev)
 {
         struct data_queue *queue;
         unsigned int i;
 
-        txall_queue_for_each(rt2x00dev, queue) {
+        queue_for_each(rt2x00dev, queue) {
                 rt2x00queue_reset(queue);
 
-                if (!rt2x00dev->ops->lib->init_txentry)
-                        continue;
-
                 for (i = 0; i < queue->limit; i++) {
                         queue->entries[i].flags = 0;
 
-                        rt2x00dev->ops->lib->init_txentry(rt2x00dev,
-                                                          &queue->entries[i]);
+                        rt2x00dev->ops->lib->clear_entry(&queue->entries[i]);
                 }
         }
 }