1 files changed, 1 insertions, 26 deletions

diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c
index 17f5697feba6..7ec0b8d6f07b 100644
--- a/drivers/scsi/qla2xxx/qla_iocb.c
+++ b/drivers/scsi/qla2xxx/qla_iocb.c
@@ -303,7 +303,6 @@ qla2x00_start_scsi(srb_t *sp)
         uint16_t        req_cnt;
         uint16_t        tot_dsds;
         struct device_reg_2xxx __iomem *reg;
-        char            tag[2];
 
         /* Setup device pointers. */
         ret = 0;
@@ -388,18 +387,6 @@ qla2x00_start_scsi(srb_t *sp)
 
         /* Update tagged queuing modifier */
         cmd_pkt->control_flags = __constant_cpu_to_le16(CF_SIMPLE_TAG);
-        if (scsi_populate_tag_msg(cmd, tag)) {
-                switch (tag[0]) {
-                case MSG_HEAD_TAG:
-                        cmd_pkt->control_flags =
-                            __constant_cpu_to_le16(CF_HEAD_TAG);
-                        break;
-                case MSG_ORDERED_TAG:
-                        cmd_pkt->control_flags =
-                            __constant_cpu_to_le16(CF_ORDERED_TAG);
-                        break;
-                }
-        }
 
         /* Load SCSI command packet. */
         memcpy(cmd_pkt->scsi_cdb, cmd->cmnd, cmd->cmd_len);
@@ -741,7 +728,6 @@ qla24xx_start_scsi(srb_t *sp)
         uint16_t        req_cnt;
         uint16_t        tot_dsds;
         struct device_reg_24xx __iomem *reg;
-        char            tag[2];
 
         /* Setup device pointers. */
         ret = 0;
@@ -816,6 +802,7 @@ qla24xx_start_scsi(srb_t *sp)
         cmd_pkt->handle = handle;
 
         /* Zero out remaining portion of packet. */
+        /*    tagged queuing modifier -- default is TSK_SIMPLE (0). */
         clr_ptr = (uint32_t *)cmd_pkt + 2;
         memset(clr_ptr, 0, REQUEST_ENTRY_SIZE - 8);
         cmd_pkt->dseg_count = cpu_to_le16(tot_dsds);
@@ -828,18 +815,6 @@ qla24xx_start_scsi(srb_t *sp)
 
         int_to_scsilun(sp->cmd->device->lun, &cmd_pkt->lun);
 
-        /* Update tagged queuing modifier -- default is TSK_SIMPLE (0). */
-        if (scsi_populate_tag_msg(cmd, tag)) {
-                switch (tag[0]) {
-                case MSG_HEAD_TAG:
-                        cmd_pkt->task = TSK_HEAD_OF_QUEUE;
-                        break;
-                case MSG_ORDERED_TAG:
-                        cmd_pkt->task = TSK_ORDERED;
-                        break;
-                }
-        }
-
         /* Load SCSI command packet. */
         memcpy(cmd_pkt->fcp_cdb, cmd->cmnd, cmd->cmd_len);
         host_to_fcp_swap(cmd_pkt->fcp_cdb, sizeof(cmd_pkt->fcp_cdb));