Commit 625a381a authored by Winkler, Tomas's avatar Winkler, Tomas Committed by John W. Linville
Browse files

iwl3945: kill iwl3945_x2_queue_used



This patch replaces iwl3945_x2_queue_used with iwl_queue_used.
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 37d68317
...@@ -344,7 +344,7 @@ static void iwl3945_rx_reply_tx(struct iwl_priv *priv, ...@@ -344,7 +344,7 @@ static void iwl3945_rx_reply_tx(struct iwl_priv *priv,
int rate_idx; int rate_idx;
int fail; int fail;
if ((index >= txq->q.n_bd) || (iwl3945_x2_queue_used(&txq->q, index) == 0)) { if ((index >= txq->q.n_bd) || (iwl_queue_used(&txq->q, index) == 0)) {
IWL_ERR(priv, "Read index for DMA queue txq_id (%d) index %d " IWL_ERR(priv, "Read index for DMA queue txq_id (%d) index %d "
"is out of range [0-%d] %d %d\n", txq_id, "is out of range [0-%d] %d %d\n", txq_id,
index, txq->q.n_bd, txq->q.write_ptr, index, txq->q.n_bd, txq->q.write_ptr,
......
...@@ -106,8 +106,6 @@ enum iwl3945_antenna { ...@@ -106,8 +106,6 @@ enum iwl3945_antenna {
#define DEFAULT_SHORT_RETRY_LIMIT 7U #define DEFAULT_SHORT_RETRY_LIMIT 7U
#define DEFAULT_LONG_RETRY_LIMIT 4U #define DEFAULT_LONG_RETRY_LIMIT 4U
int iwl3945_x2_queue_used(const struct iwl_queue *q, int i);
#include "iwl-agn-rs.h" #include "iwl-agn-rs.h"
#define IWL_TX_FIFO_AC0 0 #define IWL_TX_FIFO_AC0 0
......
...@@ -120,13 +120,6 @@ struct iwl_mod_params iwl3945_mod_params = { ...@@ -120,13 +120,6 @@ struct iwl_mod_params iwl3945_mod_params = {
* (#0-3) for data tx via EDCA. An additional 2 HCCA queues are unused. * (#0-3) for data tx via EDCA. An additional 2 HCCA queues are unused.
***************************************************/ ***************************************************/
int iwl3945_x2_queue_used(const struct iwl_queue *q, int i)
{
return q->write_ptr > q->read_ptr ?
(i >= q->read_ptr && i < q->write_ptr) :
!(i < q->read_ptr && i >= q->write_ptr);
}
/** /**
* iwl3945_queue_init - Initialize queue's high/low-water and read/write indexes * iwl3945_queue_init - Initialize queue's high/low-water and read/write indexes
*/ */
...@@ -3079,7 +3072,7 @@ static void iwl3945_cmd_queue_reclaim(struct iwl_priv *priv, ...@@ -3079,7 +3072,7 @@ static void iwl3945_cmd_queue_reclaim(struct iwl_priv *priv,
struct iwl_queue *q = &txq->q; struct iwl_queue *q = &txq->q;
int nfreed = 0; int nfreed = 0;
if ((index >= q->n_bd) || (iwl3945_x2_queue_used(q, index) == 0)) { if ((index >= q->n_bd) || (iwl_queue_used(q, index) == 0)) {
IWL_ERR(priv, "Read index for DMA queue txq id (%d), index %d, " IWL_ERR(priv, "Read index for DMA queue txq id (%d), index %d, "
"is out of range [0-%d] %d %d.\n", txq_id, "is out of range [0-%d] %d %d.\n", txq_id,
index, q->n_bd, q->write_ptr, q->read_ptr); index, q->n_bd, q->write_ptr, q->read_ptr);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment