rt2x00: remove data_queue_desc struct

If the queue_init callback is implemented
by a driver it gets used instead of the
data_queue_desc based initialization.

The queue_init callback is implemented for
each drivers now, so the old initialization
method is not used anymore. Remove the unused
data_queue_desc structure and all of the
related code.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
Acked-by: Stanislaw Gruszka <sgruszka@redhat.com>
Acked-by: Gertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 1 insertions, 41 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c
index 2a99ff1714ac..c4f1e2b8dc8e 100644
--- a/drivers/net/wireless/rt2x00/rt2x00queue.c
+++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
@@ -1276,33 +1276,6 @@ void rt2x00queue_uninitialize(struct rt2x00_dev *rt2x00dev)
         }
 }
 
-static const struct data_queue_desc *
-rt2x00queue_get_qdesc_by_qid(struct rt2x00_dev *rt2x00dev,
-                             enum data_queue_qid qid)
-{
-        switch (qid) {
-        case QID_RX:
-                return rt2x00dev->ops->rx;
-
-        case QID_AC_BE:
-        case QID_AC_BK:
-        case QID_AC_VO:
-        case QID_AC_VI:
-                return rt2x00dev->ops->tx;
-
-        case QID_BEACON:
-                return rt2x00dev->ops->bcn;
-
-        case QID_ATIM:
-                return rt2x00dev->ops->atim;
-
-        default:
-                break;
-        }
-
-        return NULL;
-}
-
 static void rt2x00queue_init(struct rt2x00_dev *rt2x00dev,
                              struct data_queue *queue, enum data_queue_qid qid)
 {
@@ -1317,20 +1290,7 @@ static void rt2x00queue_init(struct rt2x00_dev *rt2x00dev,
         queue->cw_min = 5;
         queue->cw_max = 10;
 
-        if (rt2x00dev->ops->queue_init) {
-                rt2x00dev->ops->queue_init(queue);
-        } else {
-                const struct data_queue_desc *qdesc;
-
-                qdesc = rt2x00queue_get_qdesc_by_qid(rt2x00dev, qid);
-                BUG_ON(!qdesc);
-
-                queue->limit = qdesc->entry_num;
-                queue->data_size = qdesc->data_size;
-                queue->desc_size = qdesc->desc_size;
-                queue->winfo_size = qdesc->winfo_size;
-                queue->priv_size = qdesc->priv_size;
-        }
+        rt2x00dev->ops->queue_init(queue);
 
         queue->threshold = DIV_ROUND_UP(queue->limit, 10);
 }