]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/blobdiff - drivers/net/wireless/iwlwifi/iwl-trans-tx-pcie.c
iwlagn: transport layer should receive iwl_trans
[mirror_ubuntu-artful-kernel.git] / drivers / net / wireless / iwlwifi / iwl-trans-tx-pcie.c
index ed497247f97e1be120c497ca5e692ff4cd432183..1704eab8ddf29ce5c966e42c4e601f8157f90c8c 100644 (file)
 /**
  * iwl_trans_txq_update_byte_cnt_tbl - Set up entry in Tx byte-count array
  */
-void iwl_trans_txq_update_byte_cnt_tbl(struct iwl_priv *priv,
+void iwl_trans_txq_update_byte_cnt_tbl(struct iwl_trans *trans,
                                           struct iwl_tx_queue *txq,
                                           u16 byte_cnt)
 {
        struct iwlagn_scd_bc_tbl *scd_bc_tbl;
-       struct iwl_trans *trans = trans(priv);
        struct iwl_trans_pcie *trans_pcie =
                IWL_TRANS_GET_PCIE_TRANS(trans);
        int write_ptr = txq->q.write_ptr;
@@ -170,7 +169,7 @@ static inline u8 iwl_tfd_get_num_tbs(struct iwl_tfd *tfd)
        return tfd->num_tbs & 0x1f;
 }
 
-static void iwlagn_unmap_tfd(struct iwl_priv *priv, struct iwl_cmd_meta *meta,
+static void iwlagn_unmap_tfd(struct iwl_trans *trans, struct iwl_cmd_meta *meta,
                     struct iwl_tfd *tfd, enum dma_data_direction dma_dir)
 {
        int i;
@@ -180,39 +179,39 @@ static void iwlagn_unmap_tfd(struct iwl_priv *priv, struct iwl_cmd_meta *meta,
        num_tbs = iwl_tfd_get_num_tbs(tfd);
 
        if (num_tbs >= IWL_NUM_OF_TBS) {
-               IWL_ERR(priv, "Too many chunks: %i\n", num_tbs);
+               IWL_ERR(trans, "Too many chunks: %i\n", num_tbs);
                /* @todo issue fatal error, it is quite serious situation */
                return;
        }
 
        /* Unmap tx_cmd */
        if (num_tbs)
-               dma_unmap_single(priv->bus->dev,
+               dma_unmap_single(bus(trans)->dev,
                                dma_unmap_addr(meta, mapping),
                                dma_unmap_len(meta, len),
                                DMA_BIDIRECTIONAL);
 
        /* Unmap chunks, if any. */
        for (i = 1; i < num_tbs; i++)
-               dma_unmap_single(priv->bus->dev, iwl_tfd_tb_get_addr(tfd, i),
+               dma_unmap_single(bus(trans)->dev, iwl_tfd_tb_get_addr(tfd, i),
                                iwl_tfd_tb_get_len(tfd, i), dma_dir);
 }
 
 /**
  * iwlagn_txq_free_tfd - Free all chunks referenced by TFD [txq->q.read_ptr]
- * @priv - driver private data
+ * @trans - transport private data
  * @txq - tx queue
  * @index - the index of the TFD to be freed
  *
  * Does NOT advance any TFD circular buffer read/write indexes
  * Does NOT free the TFD itself (which is within circular buffer)
  */
-void iwlagn_txq_free_tfd(struct iwl_priv *priv, struct iwl_tx_queue *txq,
+void iwlagn_txq_free_tfd(struct iwl_trans *trans, struct iwl_tx_queue *txq,
        int index)
 {
        struct iwl_tfd *tfd_tmp = txq->tfds;
 
-       iwlagn_unmap_tfd(priv, &txq->meta[index], &tfd_tmp[index],
+       iwlagn_unmap_tfd(trans, &txq->meta[index], &tfd_tmp[index],
                         DMA_TO_DEVICE);
 
        /* free SKB */
@@ -229,7 +228,7 @@ void iwlagn_txq_free_tfd(struct iwl_priv *priv, struct iwl_tx_queue *txq,
        }
 }
 
-int iwlagn_txq_attach_buf_to_tfd(struct iwl_priv *priv,
+int iwlagn_txq_attach_buf_to_tfd(struct iwl_trans *trans,
                                 struct iwl_tx_queue *txq,
                                 dma_addr_t addr, u16 len,
                                 u8 reset)
@@ -249,7 +248,7 @@ int iwlagn_txq_attach_buf_to_tfd(struct iwl_priv *priv,
 
        /* Each TFD can point to a maximum 20 Tx buffers */
        if (num_tbs >= IWL_NUM_OF_TBS) {
-               IWL_ERR(priv, "Error can not send more than %d chunks\n",
+               IWL_ERR(trans, "Error can not send more than %d chunks\n",
                          IWL_NUM_OF_TBS);
                return -EINVAL;
        }
@@ -258,7 +257,7 @@ int iwlagn_txq_attach_buf_to_tfd(struct iwl_priv *priv,
                return -EINVAL;
 
        if (unlikely(addr & ~IWL_TX_DMA_MASK))
-               IWL_ERR(priv, "Unaligned address = %llx\n",
+               IWL_ERR(trans, "Unaligned address = %llx\n",
                          (unsigned long long)addr);
 
        iwl_tfd_set_tb(tfd, num_tbs, addr, len);
@@ -307,8 +306,7 @@ int iwl_queue_space(const struct iwl_queue *q)
 /**
  * iwl_queue_init - Initialize queue's high/low-water and read/write indexes
  */
-int iwl_queue_init(struct iwl_priv *priv, struct iwl_queue *q,
-                         int count, int slots_num, u32 id)
+int iwl_queue_init(struct iwl_queue *q, int count, int slots_num, u32 id)
 {
        q->n_bd = count;
        q->n_window = slots_num;
@@ -337,23 +335,20 @@ int iwl_queue_init(struct iwl_priv *priv, struct iwl_queue *q,
        return 0;
 }
 
-static void iwlagn_txq_inval_byte_cnt_tbl(struct iwl_priv *priv,
+static void iwlagn_txq_inval_byte_cnt_tbl(struct iwl_trans *trans,
                                          struct iwl_tx_queue *txq)
 {
-       struct iwlagn_scd_bc_tbl *scd_bc_tbl;
-       struct iwl_trans *trans = trans(priv);
        struct iwl_trans_pcie *trans_pcie =
                IWL_TRANS_GET_PCIE_TRANS(trans);
+       struct iwlagn_scd_bc_tbl *scd_bc_tbl = trans_pcie->scd_bc_tbls.addr;
        int txq_id = txq->q.id;
        int read_ptr = txq->q.read_ptr;
        u8 sta_id = 0;
        __le16 bc_ent;
 
-       scd_bc_tbl = trans_pcie->scd_bc_tbls.addr;
-
        WARN_ON(read_ptr >= TFD_QUEUE_SIZE_MAX);
 
-       if (txq_id != priv->shrd->cmd_queue)
+       if (txq_id != trans->shrd->cmd_queue)
                sta_id = txq->cmd[read_ptr]->cmd.tx.sta_id;
 
        bc_ent = cpu_to_le16(1 | (sta_id << 12));
@@ -364,14 +359,13 @@ static void iwlagn_txq_inval_byte_cnt_tbl(struct iwl_priv *priv,
                        tfd_offset[TFD_QUEUE_SIZE_MAX + read_ptr] = bc_ent;
 }
 
-static int iwlagn_tx_queue_set_q2ratid(struct iwl_priv *priv, u16 ra_tid,
+static int iwlagn_tx_queue_set_q2ratid(struct iwl_trans *trans, u16 ra_tid,
                                        u16 txq_id)
 {
        u32 tbl_dw_addr;
        u32 tbl_dw;
        u16 scd_q2ratid;
 
-       struct iwl_trans *trans = trans(priv);
        struct iwl_trans_pcie *trans_pcie =
                IWL_TRANS_GET_PCIE_TRANS(trans);
 
@@ -380,34 +374,34 @@ static int iwlagn_tx_queue_set_q2ratid(struct iwl_priv *priv, u16 ra_tid,
        tbl_dw_addr = trans_pcie->scd_base_addr +
                        SCD_TRANS_TBL_OFFSET_QUEUE(txq_id);
 
-       tbl_dw = iwl_read_targ_mem(priv, tbl_dw_addr);
+       tbl_dw = iwl_read_targ_mem(priv(trans), tbl_dw_addr);
 
        if (txq_id & 0x1)
                tbl_dw = (scd_q2ratid << 16) | (tbl_dw & 0x0000FFFF);
        else
                tbl_dw = scd_q2ratid | (tbl_dw & 0xFFFF0000);
 
-       iwl_write_targ_mem(priv, tbl_dw_addr, tbl_dw);
+       iwl_write_targ_mem(priv(trans), tbl_dw_addr, tbl_dw);
 
        return 0;
 }
 
-static void iwlagn_tx_queue_stop_scheduler(struct iwl_priv *priv, u16 txq_id)
+static void iwlagn_tx_queue_stop_scheduler(struct iwl_trans *trans, u16 txq_id)
 {
        /* Simply stop the queue, but don't change any configuration;
         * the SCD_ACT_EN bit is the write-enable mask for the ACTIVE bit. */
-       iwl_write_prph(priv,
+       iwl_write_prph(priv(trans),
                SCD_QUEUE_STATUS_BITS(txq_id),
                (0 << SCD_QUEUE_STTS_REG_POS_ACTIVE)|
                (1 << SCD_QUEUE_STTS_REG_POS_SCD_ACT_EN));
 }
 
-void iwl_trans_set_wr_ptrs(struct iwl_priv *priv,
+void iwl_trans_set_wr_ptrs(struct iwl_trans *trans,
                                int txq_id, u32 index)
 {
-       iwl_write_direct32(priv, HBUS_TARG_WRPTR,
+       iwl_write_direct32(priv(trans), HBUS_TARG_WRPTR,
                        (index & 0xff) | (txq_id << 8));
-       iwl_write_prph(priv, SCD_QUEUE_RDPTR(txq_id), index);
+       iwl_write_prph(priv(trans), SCD_QUEUE_RDPTR(txq_id), index);
 }
 
 void iwl_trans_tx_queue_set_status(struct iwl_priv *priv,
@@ -459,10 +453,10 @@ void iwl_trans_pcie_txq_agg_setup(struct iwl_priv *priv, int sta_id, int tid,
        spin_lock_irqsave(&priv->shrd->lock, flags);
 
        /* Stop this Tx queue before configuring it */
-       iwlagn_tx_queue_stop_scheduler(priv, txq_id);
+       iwlagn_tx_queue_stop_scheduler(trans, txq_id);
 
        /* Map receiver-address / traffic-ID to this queue */
-       iwlagn_tx_queue_set_q2ratid(priv, ra_tid, txq_id);
+       iwlagn_tx_queue_set_q2ratid(trans, ra_tid, txq_id);
 
        /* Set this queue as a chain-building queue */
        iwl_set_bits_prph(priv, SCD_QUEUECHAIN_SEL, (1<<txq_id));
@@ -474,7 +468,7 @@ void iwl_trans_pcie_txq_agg_setup(struct iwl_priv *priv, int sta_id, int tid,
         * Assumes that ssn_idx is valid (!= 0xFFF) */
        priv->txq[txq_id].q.read_ptr = (ssn_idx & 0xff);
        priv->txq[txq_id].q.write_ptr = (ssn_idx & 0xff);
-       iwl_trans_set_wr_ptrs(priv, txq_id, ssn_idx);
+       iwl_trans_set_wr_ptrs(trans, txq_id, ssn_idx);
 
        /* Set up Tx window size and frame limit for this queue */
        iwl_write_targ_mem(priv, trans_pcie->scd_base_addr +
@@ -501,6 +495,7 @@ void iwl_trans_pcie_txq_agg_setup(struct iwl_priv *priv, int sta_id, int tid,
 int iwl_trans_pcie_txq_agg_disable(struct iwl_priv *priv, u16 txq_id,
                                  u16 ssn_idx, u8 tx_fifo)
 {
+       struct iwl_trans *trans = trans(priv);
        if ((IWLAGN_FIRST_AMPDU_QUEUE > txq_id) ||
            (IWLAGN_FIRST_AMPDU_QUEUE +
                priv->cfg->base_params->num_of_ampdu_queues <= txq_id)) {
@@ -512,14 +507,14 @@ int iwl_trans_pcie_txq_agg_disable(struct iwl_priv *priv, u16 txq_id,
                return -EINVAL;
        }
 
-       iwlagn_tx_queue_stop_scheduler(priv, txq_id);
+       iwlagn_tx_queue_stop_scheduler(trans, txq_id);
 
        iwl_clear_bits_prph(priv, SCD_AGGR_SEL, (1 << txq_id));
 
        priv->txq[txq_id].q.read_ptr = (ssn_idx & 0xff);
        priv->txq[txq_id].q.write_ptr = (ssn_idx & 0xff);
        /* supposes that ssn_idx is valid (!= 0xFFF) */
-       iwl_trans_set_wr_ptrs(priv, txq_id, ssn_idx);
+       iwl_trans_set_wr_ptrs(trans, txq_id, ssn_idx);
 
        iwl_clear_bits_prph(priv, SCD_INTERRUPT_MASK, (1 << txq_id));
        iwl_txq_ctx_deactivate(priv, txq_id);
@@ -539,8 +534,9 @@ int iwl_trans_pcie_txq_agg_disable(struct iwl_priv *priv, u16 txq_id,
  * failed. On success, it turns the index (> 0) of command in the
  * command queue.
  */
-static int iwl_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
+static int iwl_enqueue_hcmd(struct iwl_trans *trans, struct iwl_host_cmd *cmd)
 {
+       struct iwl_priv *priv = priv(trans);
        struct iwl_tx_queue *txq = &priv->txq[priv->shrd->cmd_queue];
        struct iwl_queue *q = &txq->q;
        struct iwl_device_cmd *out_cmd;
@@ -559,14 +555,14 @@ static int iwl_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
        int trace_idx;
 #endif
 
-       if (test_bit(STATUS_FW_ERROR, &priv->shrd->status)) {
-               IWL_WARN(priv, "fw recovery, no hcmd send\n");
+       if (test_bit(STATUS_FW_ERROR, &trans->shrd->status)) {
+               IWL_WARN(trans, "fw recovery, no hcmd send\n");
                return -EIO;
        }
 
        if ((priv->ucode_owner == IWL_OWNERSHIP_TM) &&
            !(cmd->flags & CMD_ON_DEMAND)) {
-               IWL_DEBUG_HC(priv, "tm own the uCode, no regular hcmd send\n");
+               IWL_DEBUG_HC(trans, "tm own the uCode, no regular hcmd send\n");
                return -EIO;
        }
 
@@ -599,9 +595,9 @@ static int iwl_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
        if (WARN_ON(copy_size > TFD_MAX_PAYLOAD_SIZE))
                return -EINVAL;
 
-       if (iwl_is_rfkill(priv->shrd) || iwl_is_ctkill(priv->shrd)) {
-               IWL_WARN(priv, "Not sending command - %s KILL\n",
-                        iwl_is_rfkill(priv->shrd) ? "RF" : "CT");
+       if (iwl_is_rfkill(trans->shrd) || iwl_is_ctkill(trans->shrd)) {
+               IWL_WARN(trans, "Not sending command - %s KILL\n",
+                        iwl_is_rfkill(trans->shrd) ? "RF" : "CT");
                return -EIO;
        }
 
@@ -610,10 +606,10 @@ static int iwl_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
        if (iwl_queue_space(q) < ((cmd->flags & CMD_ASYNC) ? 2 : 1)) {
                spin_unlock_irqrestore(&priv->hcmd_lock, flags);
 
-               IWL_ERR(priv, "No space in command queue\n");
+               IWL_ERR(trans, "No space in command queue\n");
                is_ct_kill = iwl_check_for_ct_kill(priv);
                if (!is_ct_kill) {
-                       IWL_ERR(priv, "Restarting adapter due to queue full\n");
+                       IWL_ERR(trans, "Restarting adapter queue is full\n");
                        iwlagn_fw_error(priv, false);
                }
                return -ENOSPC;
@@ -634,7 +630,7 @@ static int iwl_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
        out_cmd->hdr.cmd = cmd->id;
        out_cmd->hdr.flags = 0;
        out_cmd->hdr.sequence =
-               cpu_to_le16(QUEUE_TO_SEQ(priv->shrd->cmd_queue) |
+               cpu_to_le16(QUEUE_TO_SEQ(trans->shrd->cmd_queue) |
                                         INDEX_TO_SEQ(q->write_ptr));
 
        /* and copy the data that needs to be copied */
@@ -649,16 +645,16 @@ static int iwl_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
                cmd_dest += cmd->len[i];
        }
 
-       IWL_DEBUG_HC(priv, "Sending command %s (#%x), seq: 0x%04X, "
+       IWL_DEBUG_HC(trans, "Sending command %s (#%x), seq: 0x%04X, "
                        "%d bytes at %d[%d]:%d\n",
                        get_cmd_string(out_cmd->hdr.cmd),
                        out_cmd->hdr.cmd,
                        le16_to_cpu(out_cmd->hdr.sequence), cmd_size,
-                       q->write_ptr, idx, priv->shrd->cmd_queue);
+                       q->write_ptr, idx, trans->shrd->cmd_queue);
 
-       phys_addr = dma_map_single(priv->bus->dev, &out_cmd->hdr, copy_size,
+       phys_addr = dma_map_single(bus(trans)->dev, &out_cmd->hdr, copy_size,
                                DMA_BIDIRECTIONAL);
-       if (unlikely(dma_mapping_error(priv->bus->dev, phys_addr))) {
+       if (unlikely(dma_mapping_error(bus(trans)->dev, phys_addr))) {
                idx = -ENOMEM;
                goto out;
        }
@@ -666,7 +662,8 @@ static int iwl_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
        dma_unmap_addr_set(out_meta, mapping, phys_addr);
        dma_unmap_len_set(out_meta, len, copy_size);
 
-       iwlagn_txq_attach_buf_to_tfd(priv, txq, phys_addr, copy_size, 1);
+       iwlagn_txq_attach_buf_to_tfd(trans, txq,
+                                       phys_addr, copy_size, 1);
 #ifdef CONFIG_IWLWIFI_DEVICE_TRACING
        trace_bufs[0] = &out_cmd->hdr;
        trace_lens[0] = copy_size;
@@ -678,17 +675,18 @@ static int iwl_enqueue_hcmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
                        continue;
                if (!(cmd->dataflags[i] & IWL_HCMD_DFL_NOCOPY))
                        continue;
-               phys_addr = dma_map_single(priv->bus->dev, (void *)cmd->data[i],
+               phys_addr = dma_map_single(bus(trans)->dev,
+                                          (void *)cmd->data[i],
                                           cmd->len[i], DMA_BIDIRECTIONAL);
-               if (dma_mapping_error(priv->bus->dev, phys_addr)) {
-                       iwlagn_unmap_tfd(priv, out_meta,
+               if (dma_mapping_error(bus(trans)->dev, phys_addr)) {
+                       iwlagn_unmap_tfd(trans, out_meta,
                                         &txq->tfds[q->write_ptr],
                                         DMA_BIDIRECTIONAL);
                        idx = -ENOMEM;
                        goto out;
                }
 
-               iwlagn_txq_attach_buf_to_tfd(priv, txq, phys_addr,
+               iwlagn_txq_attach_buf_to_tfd(trans, txq, phys_addr,
                                             cmd->len[i], 0);
 #ifdef CONFIG_IWLWIFI_DEVICE_TRACING
                trace_bufs[trace_idx] = cmd->data[i];
@@ -768,17 +766,18 @@ void iwl_tx_cmd_complete(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb)
        int cmd_index;
        struct iwl_device_cmd *cmd;
        struct iwl_cmd_meta *meta;
-       struct iwl_tx_queue *txq = &priv->txq[priv->shrd->cmd_queue];
+       struct iwl_trans *trans = trans(priv);
+       struct iwl_tx_queue *txq = &priv->txq[trans->shrd->cmd_queue];
        unsigned long flags;
 
        /* If a Tx command is being handled and it isn't in the actual
         * command queue then there a command routing bug has been introduced
         * in the queue management code. */
-       if (WARN(txq_id != priv->shrd->cmd_queue,
+       if (WARN(txq_id != trans->shrd->cmd_queue,
                 "wrong command queue %d (should be %d), sequence 0x%X readp=%d writep=%d\n",
-                 txq_id, priv->shrd->cmd_queue, sequence,
-                 priv->txq[priv->shrd->cmd_queue].q.read_ptr,
-                 priv->txq[priv->shrd->cmd_queue].q.write_ptr)) {
+                 txq_id, trans->shrd->cmd_queue, sequence,
+                 priv->txq[trans->shrd->cmd_queue].q.read_ptr,
+                 priv->txq[trans->shrd->cmd_queue].q.write_ptr)) {
                iwl_print_hex_error(priv, pkt, 32);
                return;
        }
@@ -787,7 +786,8 @@ void iwl_tx_cmd_complete(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb)
        cmd = txq->cmd[cmd_index];
        meta = &txq->meta[cmd_index];
 
-       iwlagn_unmap_tfd(priv, meta, &txq->tfds[index], DMA_BIDIRECTIONAL);
+       iwlagn_unmap_tfd(trans, meta, &txq->tfds[index],
+                        DMA_BIDIRECTIONAL);
 
        /* Input error checking is done when commands are added to queue. */
        if (meta->flags & CMD_WANT_SKB) {
@@ -801,8 +801,8 @@ void iwl_tx_cmd_complete(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb)
        iwl_hcmd_queue_reclaim(priv, txq_id, index);
 
        if (!(meta->flags & CMD_ASYNC)) {
-               clear_bit(STATUS_HCMD_ACTIVE, &priv->shrd->status);
-               IWL_DEBUG_INFO(priv, "Clearing HCMD_ACTIVE for command %s\n",
+               clear_bit(STATUS_HCMD_ACTIVE, &trans->shrd->status);
+               IWL_DEBUG_INFO(trans, "Clearing HCMD_ACTIVE for command %s\n",
                               get_cmd_string(cmd->hdr.cmd));
                wake_up_interruptible(&priv->wait_command_queue);
        }
@@ -920,7 +920,7 @@ static void iwl_generic_cmd_callback(struct iwl_priv *priv,
 #endif
 }
 
-static int iwl_send_cmd_async(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
+static int iwl_send_cmd_async(struct iwl_trans *trans, struct iwl_host_cmd *cmd)
 {
        int ret;
 
@@ -932,77 +932,77 @@ static int iwl_send_cmd_async(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
        if (!cmd->callback)
                cmd->callback = iwl_generic_cmd_callback;
 
-       if (test_bit(STATUS_EXIT_PENDING, &priv->shrd->status))
+       if (test_bit(STATUS_EXIT_PENDING, &trans->shrd->status))
                return -EBUSY;
 
-       ret = iwl_enqueue_hcmd(priv, cmd);
+       ret = iwl_enqueue_hcmd(trans, cmd);
        if (ret < 0) {
-               IWL_ERR(priv, "Error sending %s: enqueue_hcmd failed: %d\n",
+               IWL_ERR(trans, "Error sending %s: enqueue_hcmd failed: %d\n",
                          get_cmd_string(cmd->id), ret);
                return ret;
        }
        return 0;
 }
 
-static int iwl_send_cmd_sync(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
+static int iwl_send_cmd_sync(struct iwl_trans *trans, struct iwl_host_cmd *cmd)
 {
        int cmd_idx;
        int ret;
 
-       lockdep_assert_held(&priv->shrd->mutex);
+       lockdep_assert_held(&trans->shrd->mutex);
 
         /* A synchronous command can not have a callback set. */
        if (WARN_ON(cmd->callback))
                return -EINVAL;
 
-       IWL_DEBUG_INFO(priv, "Attempting to send sync command %s\n",
+       IWL_DEBUG_INFO(trans, "Attempting to send sync command %s\n",
                        get_cmd_string(cmd->id));
 
-       set_bit(STATUS_HCMD_ACTIVE, &priv->shrd->status);
-       IWL_DEBUG_INFO(priv, "Setting HCMD_ACTIVE for command %s\n",
+       set_bit(STATUS_HCMD_ACTIVE, &trans->shrd->status);
+       IWL_DEBUG_INFO(trans, "Setting HCMD_ACTIVE for command %s\n",
                        get_cmd_string(cmd->id));
 
-       cmd_idx = iwl_enqueue_hcmd(priv, cmd);
+       cmd_idx = iwl_enqueue_hcmd(trans, cmd);
        if (cmd_idx < 0) {
                ret = cmd_idx;
-               clear_bit(STATUS_HCMD_ACTIVE, &priv->shrd->status);
-               IWL_ERR(priv, "Error sending %s: enqueue_hcmd failed: %d\n",
+               clear_bit(STATUS_HCMD_ACTIVE, &trans->shrd->status);
+               IWL_ERR(trans, "Error sending %s: enqueue_hcmd failed: %d\n",
                          get_cmd_string(cmd->id), ret);
                return ret;
        }
 
-       ret = wait_event_interruptible_timeout(priv->wait_command_queue,
-                       !test_bit(STATUS_HCMD_ACTIVE, &priv->shrd->status),
+       ret = wait_event_interruptible_timeout(priv(trans)->wait_command_queue,
+                       !test_bit(STATUS_HCMD_ACTIVE, &trans->shrd->status),
                        HOST_COMPLETE_TIMEOUT);
        if (!ret) {
-               if (test_bit(STATUS_HCMD_ACTIVE, &priv->shrd->status)) {
-                       IWL_ERR(priv,
+               if (test_bit(STATUS_HCMD_ACTIVE, &trans->shrd->status)) {
+                       IWL_ERR(trans,
                                "Error sending %s: time out after %dms.\n",
                                get_cmd_string(cmd->id),
                                jiffies_to_msecs(HOST_COMPLETE_TIMEOUT));
 
-                       clear_bit(STATUS_HCMD_ACTIVE, &priv->shrd->status);
-                       IWL_DEBUG_INFO(priv, "Clearing HCMD_ACTIVE for command"
+                       clear_bit(STATUS_HCMD_ACTIVE, &trans->shrd->status);
+                       IWL_DEBUG_INFO(trans, "Clearing HCMD_ACTIVE for command"
                                 "%s\n", get_cmd_string(cmd->id));
                        ret = -ETIMEDOUT;
                        goto cancel;
                }
        }
 
-       if (test_bit(STATUS_RF_KILL_HW, &priv->shrd->status)) {
-               IWL_ERR(priv, "Command %s aborted: RF KILL Switch\n",
+       if (test_bit(STATUS_RF_KILL_HW, &trans->shrd->status)) {
+               IWL_ERR(trans, "Command %s aborted: RF KILL Switch\n",
                               get_cmd_string(cmd->id));
                ret = -ECANCELED;
                goto fail;
        }
-       if (test_bit(STATUS_FW_ERROR, &priv->shrd->status)) {
-               IWL_ERR(priv, "Command %s failed: FW Error\n",
+       if (test_bit(STATUS_FW_ERROR, &trans->shrd->status)) {
+               IWL_ERR(trans, "Command %s failed: FW Error\n",
                               get_cmd_string(cmd->id));
                ret = -EIO;
                goto fail;
        }
        if ((cmd->flags & CMD_WANT_SKB) && !cmd->reply_page) {
-               IWL_ERR(priv, "Error: Response NULL in '%s'\n",
+               IWL_ERR(trans, "Error: Response NULL in '%s'\n",
                          get_cmd_string(cmd->id));
                ret = -EIO;
                goto cancel;
@@ -1018,27 +1018,27 @@ cancel:
                 * in later, it will possibly set an invalid
                 * address (cmd->meta.source).
                 */
-               priv->txq[priv->shrd->cmd_queue].meta[cmd_idx].flags &=
+               priv(trans)->txq[trans->shrd->cmd_queue].meta[cmd_idx].flags &=
                                                        ~CMD_WANT_SKB;
        }
 fail:
        if (cmd->reply_page) {
-               iwl_free_pages(priv->shrd, cmd->reply_page);
+               iwl_free_pages(trans->shrd, cmd->reply_page);
                cmd->reply_page = 0;
        }
 
        return ret;
 }
 
-int iwl_trans_pcie_send_cmd(struct iwl_priv *priv, struct iwl_host_cmd *cmd)
+int iwl_trans_pcie_send_cmd(struct iwl_trans *trans, struct iwl_host_cmd *cmd)
 {
        if (cmd->flags & CMD_ASYNC)
-               return iwl_send_cmd_async(priv, cmd);
+               return iwl_send_cmd_async(trans, cmd);
 
-       return iwl_send_cmd_sync(priv, cmd);
+       return iwl_send_cmd_sync(trans, cmd);
 }
 
-int iwl_trans_pcie_send_cmd_pdu(struct iwl_priv *priv, u8 id, u32 flags,
+int iwl_trans_pcie_send_cmd_pdu(struct iwl_trans *trans, u8 id, u32 flags,
                u16 len, const void *data)
 {
        struct iwl_host_cmd cmd = {
@@ -1048,7 +1048,7 @@ int iwl_trans_pcie_send_cmd_pdu(struct iwl_priv *priv, u8 id, u32 flags,
                .flags = flags,
        };
 
-       return iwl_trans_pcie_send_cmd(priv, &cmd);
+       return iwl_trans_pcie_send_cmd(trans, &cmd);
 }
 
 /* Frees buffers until index _not_ inclusive */
@@ -1096,8 +1096,8 @@ void iwl_tx_queue_reclaim(struct iwl_trans *trans, int txq_id, int index,
 
                tx_info->skb = NULL;
 
-               iwlagn_txq_inval_byte_cnt_tbl(priv(trans), txq);
+               iwlagn_txq_inval_byte_cnt_tbl(trans, txq);
 
-               iwlagn_txq_free_tfd(priv(trans), txq, txq->q.read_ptr);
+               iwlagn_txq_free_tfd(trans, txq, txq->q.read_ptr);
        }
 }