[rt2x00-users] [PATCH 4/4] rt2x00: Remove unused rt2x00queue_get_queue function.

[Helmut Schaa]

Am Dienstag, 1. März 2011 schrieb Gertjan van Wingerde:
> Now that all accesses to the data_queue structures is done via the specialized
> rt2x00queue_get_tx_queue and rt2x00queue_get_bcn_queue

rt2x00queue_get_bcn_queue? Is the comment left from a previous patch version?

> functions, there is no
> need for the rt2x00queue_get_queue function anymore, so remove it.
> 
> Signed-off-by: Gertjan van Wingerde <gwingerde at gmail.com>

I didn't even realize that the last few calls to rt2x00queue_get_queue 
were about the ATIM and beacon queues :)
	
So, looks good to me except the comment.

Helmut

> ---
>  drivers/net/wireless/rt2x00/rt2x00.h      |    8 --------
>  drivers/net/wireless/rt2x00/rt2x00queue.c |   19 -------------------
>  2 files changed, 0 insertions(+), 27 deletions(-)
> 
> diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
> index 72f8ebf..5217caf 100644
> --- a/drivers/net/wireless/rt2x00/rt2x00.h
> +++ b/drivers/net/wireless/rt2x00/rt2x00.h
> @@ -1083,14 +1083,6 @@ rt2x00queue_get_tx_queue(struct rt2x00_dev *rt2x00dev,
>  }
>  
>  /**
> - * rt2x00queue_get_queue - Convert queue index to queue pointer
> - * @rt2x00dev: Pointer to &struct rt2x00_dev.
> - * @queue: rt2x00 queue index (see &enum data_queue_qid).
> - */
> -struct data_queue *rt2x00queue_get_queue(struct rt2x00_dev *rt2x00dev,
> -					 const enum data_queue_qid queue);
> -
> -/**
>   * rt2x00queue_get_entry - Get queue entry where the given index points to.
>   * @queue: Pointer to &struct data_queue from where we obtain the entry.
>   * @index: Index identifier for obtaining the correct index.
> diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.c b/drivers/net/wireless/rt2x00/rt2x00queue.c
> index fcaacc6..4b3c70e 100644
> --- a/drivers/net/wireless/rt2x00/rt2x00queue.c
> +++ b/drivers/net/wireless/rt2x00/rt2x00queue.c
> @@ -705,25 +705,6 @@ void rt2x00queue_for_each_entry(struct data_queue *queue,
>  }
>  EXPORT_SYMBOL_GPL(rt2x00queue_for_each_entry);
>  
> -struct data_queue *rt2x00queue_get_queue(struct rt2x00_dev *rt2x00dev,
> -					 const enum data_queue_qid queue)
> -{
> -	if (queue == QID_RX)
> -		return rt2x00dev->rx;
> -
> -	if (queue < rt2x00dev->ops->tx_queues && rt2x00dev->tx)
> -		return &rt2x00dev->tx[queue];
> -
> -	if (queue == QID_BEACON)
> -		return rt2x00dev->bcn;
> -
> -	if (queue == QID_ATIM)
> -		return rt2x00dev->atim;
> -
> -	return NULL;
> -}
> -EXPORT_SYMBOL_GPL(rt2x00queue_get_queue);
> -
>  struct queue_entry *rt2x00queue_get_entry(struct data_queue *queue,
>  					  enum queue_index index)
>  {
>