diff options
author | James Bottomley <jejb@mulgrave.(none)> | 2005-10-28 15:41:19 -0400 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.(none)> | 2005-10-28 15:41:19 -0400 |
commit | 72df8325f4808330977d8f54c3458d30615dcb54 (patch) | |
tree | 690f9503fd3d5b08dedfa9d74ea75e15fe00320b | |
parent | aa353de649f1ba05a71b2f5b8eb1e99632ab54eb (diff) |
[SCSI] qla2xxx: fix unnecessary activation of blk tag queue
From: 'Andrew Vasquez' <andrew.vasquez@qlogic.com>
Drop scsi_populate_tag_msg() interrogation.
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Rejections fixed up and
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
-rw-r--r-- | drivers/scsi/qla2xxx/qla_iocb.c | 27 |
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) | |||
303 | uint16_t req_cnt; | 303 | uint16_t req_cnt; |
304 | uint16_t tot_dsds; | 304 | uint16_t tot_dsds; |
305 | struct device_reg_2xxx __iomem *reg; | 305 | struct device_reg_2xxx __iomem *reg; |
306 | char tag[2]; | ||
307 | 306 | ||
308 | /* Setup device pointers. */ | 307 | /* Setup device pointers. */ |
309 | ret = 0; | 308 | ret = 0; |
@@ -388,18 +387,6 @@ qla2x00_start_scsi(srb_t *sp) | |||
388 | 387 | ||
389 | /* Update tagged queuing modifier */ | 388 | /* Update tagged queuing modifier */ |
390 | cmd_pkt->control_flags = __constant_cpu_to_le16(CF_SIMPLE_TAG); | 389 | cmd_pkt->control_flags = __constant_cpu_to_le16(CF_SIMPLE_TAG); |
391 | if (scsi_populate_tag_msg(cmd, tag)) { | ||
392 | switch (tag[0]) { | ||
393 | case MSG_HEAD_TAG: | ||
394 | cmd_pkt->control_flags = | ||
395 | __constant_cpu_to_le16(CF_HEAD_TAG); | ||
396 | break; | ||
397 | case MSG_ORDERED_TAG: | ||
398 | cmd_pkt->control_flags = | ||
399 | __constant_cpu_to_le16(CF_ORDERED_TAG); | ||
400 | break; | ||
401 | } | ||
402 | } | ||
403 | 390 | ||
404 | /* Load SCSI command packet. */ | 391 | /* Load SCSI command packet. */ |
405 | memcpy(cmd_pkt->scsi_cdb, cmd->cmnd, cmd->cmd_len); | 392 | memcpy(cmd_pkt->scsi_cdb, cmd->cmnd, cmd->cmd_len); |
@@ -741,7 +728,6 @@ qla24xx_start_scsi(srb_t *sp) | |||
741 | uint16_t req_cnt; | 728 | uint16_t req_cnt; |
742 | uint16_t tot_dsds; | 729 | uint16_t tot_dsds; |
743 | struct device_reg_24xx __iomem *reg; | 730 | struct device_reg_24xx __iomem *reg; |
744 | char tag[2]; | ||
745 | 731 | ||
746 | /* Setup device pointers. */ | 732 | /* Setup device pointers. */ |
747 | ret = 0; | 733 | ret = 0; |
@@ -816,6 +802,7 @@ qla24xx_start_scsi(srb_t *sp) | |||
816 | cmd_pkt->handle = handle; | 802 | cmd_pkt->handle = handle; |
817 | 803 | ||
818 | /* Zero out remaining portion of packet. */ | 804 | /* Zero out remaining portion of packet. */ |
805 | /* tagged queuing modifier -- default is TSK_SIMPLE (0). */ | ||
819 | clr_ptr = (uint32_t *)cmd_pkt + 2; | 806 | clr_ptr = (uint32_t *)cmd_pkt + 2; |
820 | memset(clr_ptr, 0, REQUEST_ENTRY_SIZE - 8); | 807 | memset(clr_ptr, 0, REQUEST_ENTRY_SIZE - 8); |
821 | cmd_pkt->dseg_count = cpu_to_le16(tot_dsds); | 808 | cmd_pkt->dseg_count = cpu_to_le16(tot_dsds); |
@@ -828,18 +815,6 @@ qla24xx_start_scsi(srb_t *sp) | |||
828 | 815 | ||
829 | int_to_scsilun(sp->cmd->device->lun, &cmd_pkt->lun); | 816 | int_to_scsilun(sp->cmd->device->lun, &cmd_pkt->lun); |
830 | 817 | ||
831 | /* Update tagged queuing modifier -- default is TSK_SIMPLE (0). */ | ||
832 | if (scsi_populate_tag_msg(cmd, tag)) { | ||
833 | switch (tag[0]) { | ||
834 | case MSG_HEAD_TAG: | ||
835 | cmd_pkt->task = TSK_HEAD_OF_QUEUE; | ||
836 | break; | ||
837 | case MSG_ORDERED_TAG: | ||
838 | cmd_pkt->task = TSK_ORDERED; | ||
839 | break; | ||
840 | } | ||
841 | } | ||
842 | |||
843 | /* Load SCSI command packet. */ | 818 | /* Load SCSI command packet. */ |
844 | memcpy(cmd_pkt->fcp_cdb, cmd->cmnd, cmd->cmd_len); | 819 | memcpy(cmd_pkt->fcp_cdb, cmd->cmnd, cmd->cmd_len); |
845 | host_to_fcp_swap(cmd_pkt->fcp_cdb, sizeof(cmd_pkt->fcp_cdb)); | 820 | host_to_fcp_swap(cmd_pkt->fcp_cdb, sizeof(cmd_pkt->fcp_cdb)); |