]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/blobdiff - drivers/scsi/qla2xxx/qla_target.c
qla2xxx: Remove __constant_ prefix
[mirror_ubuntu-bionic-kernel.git] / drivers / scsi / qla2xxx / qla_target.c
index 4a484d60be0d4db6449bde1e77af21fe58c3639b..445af44c9a7a6074520ab958a557a9604afb2375 100644 (file)
@@ -1023,7 +1023,7 @@ static void qlt_send_notify_ack(struct scsi_qla_host *vha,
        nack->u.isp24.nport_handle = ntfy->u.isp24.nport_handle;
        if (le16_to_cpu(ntfy->u.isp24.status) == IMM_NTFY_ELS) {
                nack->u.isp24.flags = ntfy->u.isp24.flags &
-                       __constant_cpu_to_le32(NOTIFY24XX_FLAGS_PUREX_IOCB);
+                       cpu_to_le32(NOTIFY24XX_FLAGS_PUREX_IOCB);
        }
        nack->u.isp24.srr_rx_id = ntfy->u.isp24.srr_rx_id;
        nack->u.isp24.status = ntfy->u.isp24.status;
@@ -1081,7 +1081,7 @@ static void qlt_24xx_send_abts_resp(struct scsi_qla_host *vha,
        resp->sof_type = abts->sof_type;
        resp->exchange_address = abts->exchange_address;
        resp->fcp_hdr_le = abts->fcp_hdr_le;
-       f_ctl = __constant_cpu_to_le32(F_CTL_EXCH_CONTEXT_RESP |
+       f_ctl = cpu_to_le32(F_CTL_EXCH_CONTEXT_RESP |
            F_CTL_LAST_SEQ | F_CTL_END_SEQ |
            F_CTL_SEQ_INITIATIVE);
        p = (uint8_t *)&f_ctl;
@@ -1156,15 +1156,14 @@ static void qlt_24xx_retry_term_exchange(struct scsi_qla_host *vha,
        ctio->entry_count = 1;
        ctio->nport_handle = entry->nport_handle;
        ctio->handle = QLA_TGT_SKIP_HANDLE |    CTIO_COMPLETION_HANDLE_MARK;
-       ctio->timeout = __constant_cpu_to_le16(QLA_TGT_TIMEOUT);
+       ctio->timeout = cpu_to_le16(QLA_TGT_TIMEOUT);
        ctio->vp_index = vha->vp_idx;
        ctio->initiator_id[0] = entry->fcp_hdr_le.d_id[0];
        ctio->initiator_id[1] = entry->fcp_hdr_le.d_id[1];
        ctio->initiator_id[2] = entry->fcp_hdr_le.d_id[2];
        ctio->exchange_addr = entry->exchange_addr_to_abort;
-       ctio->u.status1.flags =
-           __constant_cpu_to_le16(CTIO7_FLAGS_STATUS_MODE_1 |
-               CTIO7_FLAGS_TERMINATE);
+       ctio->u.status1.flags = cpu_to_le16(CTIO7_FLAGS_STATUS_MODE_1 |
+                                           CTIO7_FLAGS_TERMINATE);
        ctio->u.status1.ox_id = cpu_to_le16(entry->fcp_hdr_le.ox_id);
 
        /* Memory Barrier */
@@ -1191,7 +1190,7 @@ static int __qlt_24xx_handle_abts(struct scsi_qla_host *vha,
        list_for_each_entry(se_cmd, &se_sess->sess_cmd_list, se_cmd_list) {
                struct qla_tgt_cmd *cmd =
                        container_of(se_cmd, struct qla_tgt_cmd, se_cmd);
-               if (cmd->tag == abts->exchange_addr_to_abort) {
+               if (se_cmd->tag == abts->exchange_addr_to_abort) {
                        lun = cmd->unpacked_lun;
                        found_lun = true;
                        break;
@@ -1324,20 +1323,19 @@ static void qlt_24xx_send_task_mgmt_ctio(struct scsi_qla_host *ha,
        ctio->entry_count = 1;
        ctio->handle = QLA_TGT_SKIP_HANDLE | CTIO_COMPLETION_HANDLE_MARK;
        ctio->nport_handle = mcmd->sess->loop_id;
-       ctio->timeout = __constant_cpu_to_le16(QLA_TGT_TIMEOUT);
+       ctio->timeout = cpu_to_le16(QLA_TGT_TIMEOUT);
        ctio->vp_index = ha->vp_idx;
        ctio->initiator_id[0] = atio->u.isp24.fcp_hdr.s_id[2];
        ctio->initiator_id[1] = atio->u.isp24.fcp_hdr.s_id[1];
        ctio->initiator_id[2] = atio->u.isp24.fcp_hdr.s_id[0];
        ctio->exchange_addr = atio->u.isp24.exchange_addr;
        ctio->u.status1.flags = (atio->u.isp24.attr << 9) |
-           __constant_cpu_to_le16(CTIO7_FLAGS_STATUS_MODE_1 |
-               CTIO7_FLAGS_SEND_STATUS);
+           cpu_to_le16(CTIO7_FLAGS_STATUS_MODE_1 | CTIO7_FLAGS_SEND_STATUS);
        temp = be16_to_cpu(atio->u.isp24.fcp_hdr.ox_id);
        ctio->u.status1.ox_id = cpu_to_le16(temp);
        ctio->u.status1.scsi_status =
-           __constant_cpu_to_le16(SS_RESPONSE_INFO_LEN_VALID);
-       ctio->u.status1.response_len = __constant_cpu_to_le16(8);
+           cpu_to_le16(SS_RESPONSE_INFO_LEN_VALID);
+       ctio->u.status1.response_len = cpu_to_le16(8);
        ctio->u.status1.sense_data[0] = resp_code;
 
        /* Memory Barrier */
@@ -1588,7 +1586,7 @@ static int qlt_24xx_build_ctio_pkt(struct qla_tgt_prm *prm,
 
        pkt->handle = h | CTIO_COMPLETION_HANDLE_MARK;
        pkt->nport_handle = prm->cmd->loop_id;
-       pkt->timeout = __constant_cpu_to_le16(QLA_TGT_TIMEOUT);
+       pkt->timeout = cpu_to_le16(QLA_TGT_TIMEOUT);
        pkt->initiator_id[0] = atio->u.isp24.fcp_hdr.s_id[2];
        pkt->initiator_id[1] = atio->u.isp24.fcp_hdr.s_id[1];
        pkt->initiator_id[2] = atio->u.isp24.fcp_hdr.s_id[0];
@@ -1728,9 +1726,8 @@ static int qlt_pre_xmit_response(struct qla_tgt_cmd *cmd,
 
        if (unlikely(cmd->aborted)) {
                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf014,
-                   "qla_target(%d): terminating exchange "
-                   "for aborted cmd=%p (se_cmd=%p, tag=%d)", vha->vp_idx, cmd,
-                   se_cmd, cmd->tag);
+                      "qla_target(%d): terminating exchange for aborted cmd=%p (se_cmd=%p, tag=%lld)",
+                      vha->vp_idx, cmd, se_cmd, se_cmd->tag);
 
                cmd->state = QLA_TGT_STATE_ABORTED;
                cmd->cmd_flags |= BIT_6;
@@ -1765,18 +1762,17 @@ static int qlt_pre_xmit_response(struct qla_tgt_cmd *cmd,
        if (se_cmd->se_cmd_flags & SCF_UNDERFLOW_BIT) {
                prm->residual = se_cmd->residual_count;
                ql_dbg(ql_dbg_io + ql_dbg_verbose, vha, 0x305c,
-                   "Residual underflow: %d (tag %d, "
-                   "op %x, bufflen %d, rq_result %x)\n", prm->residual,
-                   cmd->tag, se_cmd->t_task_cdb ? se_cmd->t_task_cdb[0] : 0,
-                   cmd->bufflen, prm->rq_result);
+                   "Residual underflow: %d (tag %lld, op %x, bufflen %d, rq_result %x)\n",
+                      prm->residual, se_cmd->tag,
+                      se_cmd->t_task_cdb ? se_cmd->t_task_cdb[0] : 0,
+                      cmd->bufflen, prm->rq_result);
                prm->rq_result |= SS_RESIDUAL_UNDER;
        } else if (se_cmd->se_cmd_flags & SCF_OVERFLOW_BIT) {
                prm->residual = se_cmd->residual_count;
                ql_dbg(ql_dbg_io, vha, 0x305d,
-                   "Residual overflow: %d (tag %d, "
-                   "op %x, bufflen %d, rq_result %x)\n", prm->residual,
-                   cmd->tag, se_cmd->t_task_cdb ? se_cmd->t_task_cdb[0] : 0,
-                   cmd->bufflen, prm->rq_result);
+                   "Residual overflow: %d (tag %lld, op %x, bufflen %d, rq_result %x)\n",
+                      prm->residual, se_cmd->tag, se_cmd->t_task_cdb ?
+                      se_cmd->t_task_cdb[0] : 0, cmd->bufflen, prm->rq_result);
                prm->rq_result |= SS_RESIDUAL_OVER;
        }
 
@@ -1849,7 +1845,7 @@ static void qlt_check_srr_debug(struct qla_tgt_cmd *cmd, int *xmit_type)
            == 50) {
                *xmit_type &= ~QLA_TGT_XMIT_STATUS;
                ql_dbg(ql_dbg_tgt_mgt, cmd->vha, 0xf015,
-                   "Dropping cmd %p (tag %d) status", cmd, cmd->tag);
+                   "Dropping cmd %p (tag %d) status", cmd, se_cmd->tag);
        }
 #endif
        /*
@@ -1873,7 +1869,7 @@ static void qlt_check_srr_debug(struct qla_tgt_cmd *cmd, int *xmit_type)
                ql_dbg(ql_dbg_tgt_mgt, cmd->vha, 0xf016,
                    "Cutting cmd %p (tag %d) buffer"
                    " tail to len %d, sg_cnt %d (cmd->bufflen %d,"
-                   " cmd->sg_cnt %d)", cmd, cmd->tag, tot_len, leave,
+                   " cmd->sg_cnt %d)", cmd, se_cmd->tag, tot_len, leave,
                    cmd->bufflen, cmd->sg_cnt);
 
                cmd->bufflen = tot_len;
@@ -1885,13 +1881,13 @@ static void qlt_check_srr_debug(struct qla_tgt_cmd *cmd, int *xmit_type)
 
                ql_dbg(ql_dbg_tgt_mgt, cmd->vha, 0xf017,
                    "Cutting cmd %p (tag %d) buffer head "
-                   "to offset %d (cmd->bufflen %d)", cmd, cmd->tag, offset,
+                   "to offset %d (cmd->bufflen %d)", cmd, se_cmd->tag, offset,
                    cmd->bufflen);
                if (offset == 0)
                        *xmit_type &= ~QLA_TGT_XMIT_DATA;
                else if (qlt_set_data_offset(cmd, offset)) {
                        ql_dbg(ql_dbg_tgt_mgt, cmd->vha, 0xf018,
-                           "qlt_set_data_offset() failed (tag %d)", cmd->tag);
+                           "qlt_set_data_offset() failed (tag %d)", se_cmd->tag);
                }
        }
 }
@@ -1905,10 +1901,9 @@ static void qlt_24xx_init_ctio_to_isp(struct ctio7_to_24xx *ctio,
 {
        prm->sense_buffer_len = min_t(uint32_t, prm->sense_buffer_len,
            (uint32_t)sizeof(ctio->u.status1.sense_data));
-       ctio->u.status0.flags |=
-           __constant_cpu_to_le16(CTIO7_FLAGS_SEND_STATUS);
+       ctio->u.status0.flags |= cpu_to_le16(CTIO7_FLAGS_SEND_STATUS);
        if (qlt_need_explicit_conf(prm->tgt->ha, prm->cmd, 0)) {
-               ctio->u.status0.flags |= __constant_cpu_to_le16(
+               ctio->u.status0.flags |= cpu_to_le16(
                    CTIO7_FLAGS_EXPLICIT_CONFORM |
                    CTIO7_FLAGS_CONFORM_REQ);
        }
@@ -1925,17 +1920,17 @@ static void qlt_24xx_init_ctio_to_isp(struct ctio7_to_24xx *ctio,
                                    "non GOOD status\n");
                                goto skip_explict_conf;
                        }
-                       ctio->u.status1.flags |= __constant_cpu_to_le16(
+                       ctio->u.status1.flags |= cpu_to_le16(
                            CTIO7_FLAGS_EXPLICIT_CONFORM |
                            CTIO7_FLAGS_CONFORM_REQ);
                }
 skip_explict_conf:
                ctio->u.status1.flags &=
-                   ~__constant_cpu_to_le16(CTIO7_FLAGS_STATUS_MODE_0);
+                   ~cpu_to_le16(CTIO7_FLAGS_STATUS_MODE_0);
                ctio->u.status1.flags |=
-                   __constant_cpu_to_le16(CTIO7_FLAGS_STATUS_MODE_1);
+                   cpu_to_le16(CTIO7_FLAGS_STATUS_MODE_1);
                ctio->u.status1.scsi_status |=
-                   __constant_cpu_to_le16(SS_SENSE_LEN_VALID);
+                   cpu_to_le16(SS_SENSE_LEN_VALID);
                ctio->u.status1.sense_length =
                    cpu_to_le16(prm->sense_buffer_len);
                for (i = 0; i < prm->sense_buffer_len/4; i++)
@@ -1955,9 +1950,9 @@ skip_explict_conf:
 #endif
        } else {
                ctio->u.status1.flags &=
-                   ~__constant_cpu_to_le16(CTIO7_FLAGS_STATUS_MODE_0);
+                   ~cpu_to_le16(CTIO7_FLAGS_STATUS_MODE_0);
                ctio->u.status1.flags |=
-                   __constant_cpu_to_le16(CTIO7_FLAGS_STATUS_MODE_1);
+                   cpu_to_le16(CTIO7_FLAGS_STATUS_MODE_1);
                ctio->u.status1.sense_length = 0;
                memset(ctio->u.status1.sense_data, 0,
                    sizeof(ctio->u.status1.sense_data));
@@ -2079,7 +2074,6 @@ static inline int
 qlt_build_ctio_crc2_pkt(struct qla_tgt_prm *prm, scsi_qla_host_t *vha)
 {
        uint32_t                *cur_dsd;
-       int                     sgc;
        uint32_t                transfer_length = 0;
        uint32_t                data_bytes;
        uint32_t                dif_bytes;
@@ -2096,7 +2090,6 @@ qlt_build_ctio_crc2_pkt(struct qla_tgt_prm *prm, scsi_qla_host_t *vha)
        struct atio_from_isp *atio = &prm->cmd->atio;
        uint16_t t16;
 
-       sgc = 0;
        ha = vha->hw;
 
        pkt = (struct ctio_crc2_to_fw *)vha->req->ring_ptr;
@@ -2186,7 +2179,7 @@ qlt_build_ctio_crc2_pkt(struct qla_tgt_prm *prm, scsi_qla_host_t *vha)
 
        pkt->handle  = h | CTIO_COMPLETION_HANDLE_MARK;
        pkt->nport_handle = prm->cmd->loop_id;
-       pkt->timeout = __constant_cpu_to_le16(QLA_TGT_TIMEOUT);
+       pkt->timeout = cpu_to_le16(QLA_TGT_TIMEOUT);
        pkt->initiator_id[0] = atio->u.isp24.fcp_hdr.s_id[2];
        pkt->initiator_id[1] = atio->u.isp24.fcp_hdr.s_id[1];
        pkt->initiator_id[2] = atio->u.isp24.fcp_hdr.s_id[0];
@@ -2202,9 +2195,9 @@ qlt_build_ctio_crc2_pkt(struct qla_tgt_prm *prm, scsi_qla_host_t *vha)
 
        /* Set transfer direction */
        if (cmd->dma_data_direction == DMA_TO_DEVICE)
-               pkt->flags = __constant_cpu_to_le16(CTIO7_FLAGS_DATA_IN);
+               pkt->flags = cpu_to_le16(CTIO7_FLAGS_DATA_IN);
        else if (cmd->dma_data_direction == DMA_FROM_DEVICE)
-               pkt->flags = __constant_cpu_to_le16(CTIO7_FLAGS_DATA_OUT);
+               pkt->flags = cpu_to_le16(CTIO7_FLAGS_DATA_OUT);
 
 
        pkt->dseg_count = prm->tot_dsds;
@@ -2256,11 +2249,11 @@ qlt_build_ctio_crc2_pkt(struct qla_tgt_prm *prm, scsi_qla_host_t *vha)
        crc_ctx_pkt->blk_size   = cpu_to_le16(cmd->blk_sz);
        crc_ctx_pkt->prot_opts  = cpu_to_le16(fw_prot_opts);
        crc_ctx_pkt->byte_count = cpu_to_le32(data_bytes);
-       crc_ctx_pkt->guard_seed = __constant_cpu_to_le16(0);
+       crc_ctx_pkt->guard_seed = cpu_to_le16(0);
 
 
        /* Walks data segments */
-       pkt->flags |= __constant_cpu_to_le16(CTIO7_FLAGS_DSD_PTR);
+       pkt->flags |= cpu_to_le16(CTIO7_FLAGS_DSD_PTR);
 
        if (!bundling && prm->prot_seg_cnt) {
                if (qla24xx_walk_and_build_sglist_no_difb(ha, NULL, cur_dsd,
@@ -2355,7 +2348,7 @@ int qlt_xmit_response(struct qla_tgt_cmd *cmd, int xmit_type,
 
        if (qlt_has_data(cmd) && (xmit_type & QLA_TGT_XMIT_DATA)) {
                pkt->u.status0.flags |=
-                   __constant_cpu_to_le16(CTIO7_FLAGS_DATA_IN |
+                   cpu_to_le16(CTIO7_FLAGS_DATA_IN |
                        CTIO7_FLAGS_STATUS_MODE_0);
 
                if (cmd->se_cmd.prot_op == TARGET_PROT_NORMAL)
@@ -2367,11 +2360,11 @@ int qlt_xmit_response(struct qla_tgt_cmd *cmd, int xmit_type,
                                    cpu_to_le16(prm.rq_result);
                                pkt->u.status0.residual =
                                    cpu_to_le32(prm.residual);
-                               pkt->u.status0.flags |= __constant_cpu_to_le16(
+                               pkt->u.status0.flags |= cpu_to_le16(
                                    CTIO7_FLAGS_SEND_STATUS);
                                if (qlt_need_explicit_conf(ha, cmd, 0)) {
                                        pkt->u.status0.flags |=
-                                           __constant_cpu_to_le16(
+                                           cpu_to_le16(
                                                CTIO7_FLAGS_EXPLICIT_CONFORM |
                                                CTIO7_FLAGS_CONFORM_REQ);
                                }
@@ -2399,12 +2392,12 @@ int qlt_xmit_response(struct qla_tgt_cmd *cmd, int xmit_type,
                        ctio->entry_count = 1;
                        ctio->entry_type = CTIO_TYPE7;
                        ctio->dseg_count = 0;
-                       ctio->u.status1.flags &= ~__constant_cpu_to_le16(
+                       ctio->u.status1.flags &= ~cpu_to_le16(
                            CTIO7_FLAGS_DATA_IN);
 
                        /* Real finish is ctio_m1's finish */
                        pkt->handle |= CTIO_INTERMEDIATE_HANDLE_MARK;
-                       pkt->u.status0.flags |= __constant_cpu_to_le16(
+                       pkt->u.status0.flags |= cpu_to_le16(
                            CTIO7_FLAGS_DONT_RET_CTIO);
 
                        /* qlt_24xx_init_ctio_to_isp will correct
@@ -2490,7 +2483,7 @@ int qlt_rdy_to_xfer(struct qla_tgt_cmd *cmd)
        if (unlikely(res != 0))
                goto out_unlock_free_unmap;
        pkt = (struct ctio7_to_24xx *)prm.pkt;
-       pkt->u.status0.flags |= __constant_cpu_to_le16(CTIO7_FLAGS_DATA_OUT |
+       pkt->u.status0.flags |= cpu_to_le16(CTIO7_FLAGS_DATA_OUT |
            CTIO7_FLAGS_STATUS_MODE_0);
 
        if (cmd->se_cmd.prot_op == TARGET_PROT_NORMAL)
@@ -2565,7 +2558,7 @@ qlt_handle_dif_error(struct scsi_qla_host *vha, struct qla_tgt_cmd *cmd,
 
                /* Update protection tag */
                if (cmd->prot_sg_cnt) {
-                       uint32_t i, j = 0, k = 0, num_ent;
+                       uint32_t i, k = 0, num_ent;
                        struct scatterlist *sg, *sgl;
 
 
@@ -2578,7 +2571,6 @@ qlt_handle_dif_error(struct scsi_qla_host *vha, struct qla_tgt_cmd *cmd,
                                        k += num_ent;
                                        continue;
                                }
-                               j = blocks_done - k - 1;
                                k = blocks_done;
                                break;
                        }
@@ -2689,14 +2681,14 @@ static int __qlt_send_term_exchange(struct scsi_qla_host *vha,
        ctio24 = (struct ctio7_to_24xx *)pkt;
        ctio24->entry_type = CTIO_TYPE7;
        ctio24->nport_handle = cmd ? cmd->loop_id : CTIO7_NHANDLE_UNRECOGNIZED;
-       ctio24->timeout = __constant_cpu_to_le16(QLA_TGT_TIMEOUT);
+       ctio24->timeout = cpu_to_le16(QLA_TGT_TIMEOUT);
        ctio24->vp_index = vha->vp_idx;
        ctio24->initiator_id[0] = atio->u.isp24.fcp_hdr.s_id[2];
        ctio24->initiator_id[1] = atio->u.isp24.fcp_hdr.s_id[1];
        ctio24->initiator_id[2] = atio->u.isp24.fcp_hdr.s_id[0];
        ctio24->exchange_addr = atio->u.isp24.exchange_addr;
        ctio24->u.status1.flags = (atio->u.isp24.attr << 9) |
-           __constant_cpu_to_le16(CTIO7_FLAGS_STATUS_MODE_1 |
+           cpu_to_le16(CTIO7_FLAGS_STATUS_MODE_1 |
                CTIO7_FLAGS_TERMINATE);
        temp = be16_to_cpu(atio->u.isp24.fcp_hdr.ox_id);
        ctio24->u.status1.ox_id = cpu_to_le16(temp);
@@ -2917,7 +2909,7 @@ static int qlt_term_ctio_exchange(struct scsi_qla_host *vha, void *ctio,
        if (ctio != NULL) {
                struct ctio7_from_24xx *c = (struct ctio7_from_24xx *)ctio;
                term = !(c->flags &
-                   __constant_cpu_to_le16(OF_TERM_EXCH));
+                   cpu_to_le16(OF_TERM_EXCH));
        } else
                term = 1;
 
@@ -3065,7 +3057,6 @@ static void qlt_do_ctio_completion(struct scsi_qla_host *vha, uint32_t handle,
 {
        struct qla_hw_data *ha = vha->hw;
        struct se_cmd *se_cmd;
-       const struct target_core_fabric_ops *tfo;
        struct qla_tgt_cmd *cmd;
 
        if (handle & CTIO_INTERMEDIATE_HANDLE_MARK) {
@@ -3083,7 +3074,6 @@ static void qlt_do_ctio_completion(struct scsi_qla_host *vha, uint32_t handle,
                return;
 
        se_cmd = &cmd->se_cmd;
-       tfo = se_cmd->se_tfo;
        cmd->cmd_sent_to_fw = 0;
 
        qlt_unmap_sg(vha, cmd);
@@ -3181,20 +3171,16 @@ skip_term:
        if (cmd->state == QLA_TGT_STATE_PROCESSED) {
                ;
        } else if (cmd->state == QLA_TGT_STATE_NEED_DATA) {
-               int rx_status = 0;
-
                cmd->state = QLA_TGT_STATE_DATA_IN;
 
-               if (unlikely(status != CTIO_SUCCESS))
-                       rx_status = -EIO;
-               else
+               if (status == CTIO_SUCCESS)
                        cmd->write_data_transferred = 1;
 
                ha->tgt.tgt_ops->handle_data(cmd);
                return;
        } else if (cmd->state == QLA_TGT_STATE_ABORTED) {
                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf01e,
-                   "Aborted command %p (tag %d) finished\n", cmd, cmd->tag);
+                 "Aborted command %p (tag %lld) finished\n", cmd, se_cmd->tag);
        } else {
                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf05c,
                    "qla_target(%d): A command in state (%d) should "
@@ -3266,7 +3252,7 @@ static void __qlt_do_work(struct qla_tgt_cmd *cmd)
                goto out_term;
 
        cdb = &atio->u.isp24.fcp_cmnd.cdb[0];
-       cmd->tag = atio->u.isp24.exchange_addr;
+       cmd->se_cmd.tag = atio->u.isp24.exchange_addr;
        cmd->unpacked_lun = scsilun_to_int(
            (struct scsi_lun *)&atio->u.isp24.fcp_cmnd.lun);
 
@@ -3582,12 +3568,11 @@ static int qlt_handle_task_mgmt(struct scsi_qla_host *vha, void *iocb)
        struct qla_tgt *tgt;
        struct qla_tgt_sess *sess;
        uint32_t lun, unpacked_lun;
-       int lun_size, fn;
+       int fn;
 
        tgt = vha->vha_tgt.qla_tgt;
 
        lun = a->u.isp24.fcp_cmnd.lun;
-       lun_size = sizeof(a->u.isp24.fcp_cmnd.lun);
        fn = a->u.isp24.fcp_cmnd.task_mgmt_flags;
        sess = ha->tgt.tgt_ops->find_sess_by_s_id(vha,
            a->u.isp24.fcp_hdr.s_id);
@@ -3893,9 +3878,8 @@ static void qlt_handle_srr(struct scsi_qla_host *vha,
                        resp = 1;
                } else {
                        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf064,
-                           "qla_target(%d): SRR for in data for cmd "
-                           "without them (tag %d, SCSI status %d), "
-                           "reject", vha->vp_idx, cmd->tag,
+                              "qla_target(%d): SRR for in data for cmd without them (tag %lld, SCSI status %d), reject",
+                              vha->vp_idx, se_cmd->tag,
                            cmd->se_cmd.scsi_status);
                        goto out_reject;
                }
@@ -3929,10 +3913,8 @@ static void qlt_handle_srr(struct scsi_qla_host *vha,
                        }
                } else {
                        ql_dbg(ql_dbg_tgt_mgt, vha, 0xf066,
-                           "qla_target(%d): SRR for out data for cmd "
-                           "without them (tag %d, SCSI status %d), "
-                           "reject", vha->vp_idx, cmd->tag,
-                           cmd->se_cmd.scsi_status);
+                           "qla_target(%d): SRR for out data for cmd without them (tag %lld, SCSI status %d), reject",
+                              vha->vp_idx, se_cmd->tag, cmd->se_cmd.scsi_status);
                        goto out_reject;
                }
                break;
@@ -4053,10 +4035,9 @@ restart:
                cmd->sg = se_cmd->t_data_sg;
 
                ql_dbg(ql_dbg_tgt_mgt, vha, 0xf02c,
-                   "SRR cmd %p (se_cmd %p, tag %d, op %x), "
-                   "sg_cnt=%d, offset=%d", cmd, &cmd->se_cmd, cmd->tag,
-                   se_cmd->t_task_cdb ? se_cmd->t_task_cdb[0] : 0,
-                   cmd->sg_cnt, cmd->offset);
+                      "SRR cmd %p (se_cmd %p, tag %lld, op %x), sg_cnt=%d, offset=%d",
+                      cmd, &cmd->se_cmd, se_cmd->tag, se_cmd->t_task_cdb ?
+                      se_cmd->t_task_cdb[0] : 0, cmd->sg_cnt, cmd->offset);
 
                qlt_handle_srr(vha, sctio, imm);
 
@@ -4327,14 +4308,14 @@ static int __qlt_send_busy(struct scsi_qla_host *vha,
        ctio24 = (struct ctio7_to_24xx *)pkt;
        ctio24->entry_type = CTIO_TYPE7;
        ctio24->nport_handle = sess->loop_id;
-       ctio24->timeout = __constant_cpu_to_le16(QLA_TGT_TIMEOUT);
+       ctio24->timeout = cpu_to_le16(QLA_TGT_TIMEOUT);
        ctio24->vp_index = vha->vp_idx;
        ctio24->initiator_id[0] = atio->u.isp24.fcp_hdr.s_id[2];
        ctio24->initiator_id[1] = atio->u.isp24.fcp_hdr.s_id[1];
        ctio24->initiator_id[2] = atio->u.isp24.fcp_hdr.s_id[0];
        ctio24->exchange_addr = atio->u.isp24.exchange_addr;
        ctio24->u.status1.flags = (atio->u.isp24.attr << 9) |
-           __constant_cpu_to_le16(
+           cpu_to_le16(
                CTIO7_FLAGS_STATUS_MODE_1 | CTIO7_FLAGS_SEND_STATUS |
                CTIO7_FLAGS_DONT_RET_CTIO);
        /*
@@ -4662,7 +4643,7 @@ static void qlt_response_pkt(struct scsi_qla_host *vha, response_t *pkt)
                struct atio_from_isp *atio = (struct atio_from_isp *)pkt;
                int rc;
                if (atio->u.isp2x.status !=
-                   __constant_cpu_to_le16(ATIO_CDB_VALID)) {
+                   cpu_to_le16(ATIO_CDB_VALID)) {
                        ql_dbg(ql_dbg_tgt, vha, 0xe05e,
                            "qla_target(%d): ATIO with error "
                            "status %x received\n", vha->vp_idx,
@@ -4736,7 +4717,7 @@ static void qlt_response_pkt(struct scsi_qla_host *vha, response_t *pkt)
                            le16_to_cpu(entry->u.isp2x.status));
                        tgt->notify_ack_expected--;
                        if (entry->u.isp2x.status !=
-                           __constant_cpu_to_le16(NOTIFY_ACK_SUCCESS)) {
+                           cpu_to_le16(NOTIFY_ACK_SUCCESS)) {
                                ql_dbg(ql_dbg_tgt, vha, 0xe061,
                                    "qla_target(%d): NOTIFY_ACK "
                                    "failed %x\n", vha->vp_idx,
@@ -5050,7 +5031,7 @@ static void qlt_tmr_work(struct qla_tgt *tgt,
        uint8_t *s_id = NULL; /* to hide compiler warnings */
        int rc;
        uint32_t lun, unpacked_lun;
-       int lun_size, fn;
+       int fn;
        void *iocb;
 
        spin_lock_irqsave(&ha->hardware_lock, flags);
@@ -5077,7 +5058,6 @@ static void qlt_tmr_work(struct qla_tgt *tgt,
 
        iocb = a;
        lun = a->u.isp24.fcp_cmnd.lun;
-       lun_size = sizeof(lun);
        fn = a->u.isp24.fcp_cmnd.task_mgmt_flags;
        unpacked_lun = scsilun_to_int((struct scsi_lun *)&lun);
 
@@ -5600,19 +5580,19 @@ qlt_24xx_config_nvram_stage1(struct scsi_qla_host *vha, struct nvram_24xx *nv)
                        ha->tgt.saved_set = 1;
                }
 
-               nv->exchange_count = __constant_cpu_to_le16(0xFFFF);
+               nv->exchange_count = cpu_to_le16(0xFFFF);
 
                /* Enable target mode */
-               nv->firmware_options_1 |= __constant_cpu_to_le32(BIT_4);
+               nv->firmware_options_1 |= cpu_to_le32(BIT_4);
 
                /* Disable ini mode, if requested */
                if (!qla_ini_mode_enabled(vha))
-                       nv->firmware_options_1 |= __constant_cpu_to_le32(BIT_5);
+                       nv->firmware_options_1 |= cpu_to_le32(BIT_5);
 
                /* Disable Full Login after LIP */
-               nv->firmware_options_1 &= __constant_cpu_to_le32(~BIT_13);
+               nv->firmware_options_1 &= cpu_to_le32(~BIT_13);
                /* Enable initial LIP */
-               nv->firmware_options_1 &= __constant_cpu_to_le32(~BIT_9);
+               nv->firmware_options_1 &= cpu_to_le32(~BIT_9);
                if (ql2xtgt_tape_enable)
                        /* Enable FC Tape support */
                        nv->firmware_options_2 |= cpu_to_le32(BIT_12);
@@ -5621,9 +5601,9 @@ qlt_24xx_config_nvram_stage1(struct scsi_qla_host *vha, struct nvram_24xx *nv)
                        nv->firmware_options_2 &= cpu_to_le32(~BIT_12);
 
                /* Disable Full Login after LIP */
-               nv->host_p &= __constant_cpu_to_le32(~BIT_10);
+               nv->host_p &= cpu_to_le32(~BIT_10);
                /* Enable target PRLI control */
-               nv->firmware_options_2 |= __constant_cpu_to_le32(BIT_14);
+               nv->firmware_options_2 |= cpu_to_le32(BIT_14);
        } else {
                if (ha->tgt.saved_set) {
                        nv->exchange_count = ha->tgt.saved_exchange_count;
@@ -5645,12 +5625,12 @@ qlt_24xx_config_nvram_stage1(struct scsi_qla_host *vha, struct nvram_24xx *nv)
                        fc_host_supported_classes(vha->host) =
                                FC_COS_CLASS2 | FC_COS_CLASS3;
 
-               nv->firmware_options_2 |= __constant_cpu_to_le32(BIT_8);
+               nv->firmware_options_2 |= cpu_to_le32(BIT_8);
        } else {
                if (vha->flags.init_done)
                        fc_host_supported_classes(vha->host) = FC_COS_CLASS3;
 
-               nv->firmware_options_2 &= ~__constant_cpu_to_le32(BIT_8);
+               nv->firmware_options_2 &= ~cpu_to_le32(BIT_8);
        }
 }
 
@@ -5662,7 +5642,7 @@ qlt_24xx_config_nvram_stage2(struct scsi_qla_host *vha,
 
        if (ha->tgt.node_name_set) {
                memcpy(icb->node_name, ha->tgt.tgt_node_name, WWN_SIZE);
-               icb->firmware_options_1 |= __constant_cpu_to_le32(BIT_14);
+               icb->firmware_options_1 |= cpu_to_le32(BIT_14);
        }
 }
 
@@ -5687,20 +5667,19 @@ qlt_81xx_config_nvram_stage1(struct scsi_qla_host *vha, struct nvram_81xx *nv)
                        ha->tgt.saved_set = 1;
                }
 
-               nv->exchange_count = __constant_cpu_to_le16(0xFFFF);
+               nv->exchange_count = cpu_to_le16(0xFFFF);
 
                /* Enable target mode */
-               nv->firmware_options_1 |= __constant_cpu_to_le32(BIT_4);
+               nv->firmware_options_1 |= cpu_to_le32(BIT_4);
 
                /* Disable ini mode, if requested */
                if (!qla_ini_mode_enabled(vha))
-                       nv->firmware_options_1 |=
-                           __constant_cpu_to_le32(BIT_5);
+                       nv->firmware_options_1 |= cpu_to_le32(BIT_5);
 
                /* Disable Full Login after LIP */
-               nv->firmware_options_1 &= __constant_cpu_to_le32(~BIT_13);
+               nv->firmware_options_1 &= cpu_to_le32(~BIT_13);
                /* Enable initial LIP */
-               nv->firmware_options_1 &= __constant_cpu_to_le32(~BIT_9);
+               nv->firmware_options_1 &= cpu_to_le32(~BIT_9);
                if (ql2xtgt_tape_enable)
                        /* Enable FC tape support */
                        nv->firmware_options_2 |= cpu_to_le32(BIT_12);
@@ -5709,9 +5688,9 @@ qlt_81xx_config_nvram_stage1(struct scsi_qla_host *vha, struct nvram_81xx *nv)
                        nv->firmware_options_2 &= cpu_to_le32(~BIT_12);
 
                /* Disable Full Login after LIP */
-               nv->host_p &= __constant_cpu_to_le32(~BIT_10);
+               nv->host_p &= cpu_to_le32(~BIT_10);
                /* Enable target PRLI control */
-               nv->firmware_options_2 |= __constant_cpu_to_le32(BIT_14);
+               nv->firmware_options_2 |= cpu_to_le32(BIT_14);
        } else {
                if (ha->tgt.saved_set) {
                        nv->exchange_count = ha->tgt.saved_exchange_count;
@@ -5733,12 +5712,12 @@ qlt_81xx_config_nvram_stage1(struct scsi_qla_host *vha, struct nvram_81xx *nv)
                        fc_host_supported_classes(vha->host) =
                                FC_COS_CLASS2 | FC_COS_CLASS3;
 
-               nv->firmware_options_2 |= __constant_cpu_to_le32(BIT_8);
+               nv->firmware_options_2 |= cpu_to_le32(BIT_8);
        } else {
                if (vha->flags.init_done)
                        fc_host_supported_classes(vha->host) = FC_COS_CLASS3;
 
-               nv->firmware_options_2 &= ~__constant_cpu_to_le32(BIT_8);
+               nv->firmware_options_2 &= ~cpu_to_le32(BIT_8);
        }
 }
 
@@ -5753,7 +5732,7 @@ qlt_81xx_config_nvram_stage2(struct scsi_qla_host *vha,
 
        if (ha->tgt.node_name_set) {
                memcpy(icb->node_name, ha->tgt.tgt_node_name, WWN_SIZE);
-               icb->firmware_options_1 |= __constant_cpu_to_le32(BIT_14);
+               icb->firmware_options_1 |= cpu_to_le32(BIT_14);
        }
 }