diff options
Diffstat (limited to 'drivers/scsi/qla2xxx/qla_iocb.c')
-rw-r--r-- | drivers/scsi/qla2xxx/qla_iocb.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c index ec066074c722..6b1a0450e8d4 100644 --- a/drivers/scsi/qla2xxx/qla_iocb.c +++ b/drivers/scsi/qla2xxx/qla_iocb.c | |||
@@ -334,7 +334,6 @@ qla2x00_start_scsi(srb_t *sp) | |||
334 | uint32_t index; | 334 | uint32_t index; |
335 | uint32_t handle; | 335 | uint32_t handle; |
336 | cmd_entry_t *cmd_pkt; | 336 | cmd_entry_t *cmd_pkt; |
337 | uint32_t timeout; | ||
338 | struct scatterlist *sg; | 337 | struct scatterlist *sg; |
339 | uint16_t cnt; | 338 | uint16_t cnt; |
340 | uint16_t req_cnt; | 339 | uint16_t req_cnt; |
@@ -433,18 +432,6 @@ qla2x00_start_scsi(srb_t *sp) | |||
433 | } | 432 | } |
434 | } | 433 | } |
435 | 434 | ||
436 | /* | ||
437 | * Allocate at least 5 (+ QLA_CMD_TIMER_DELTA) seconds for RISC timeout. | ||
438 | */ | ||
439 | timeout = (uint32_t)(cmd->timeout_per_command / HZ); | ||
440 | if (timeout > 65535) | ||
441 | cmd_pkt->timeout = __constant_cpu_to_le16(0); | ||
442 | else if (timeout > 25) | ||
443 | cmd_pkt->timeout = cpu_to_le16((uint16_t)timeout - | ||
444 | (5 + QLA_CMD_TIMER_DELTA)); | ||
445 | else | ||
446 | cmd_pkt->timeout = cpu_to_le16((uint16_t)timeout); | ||
447 | |||
448 | /* Load SCSI command packet. */ | 435 | /* Load SCSI command packet. */ |
449 | memcpy(cmd_pkt->scsi_cdb, cmd->cmnd, cmd->cmd_len); | 436 | memcpy(cmd_pkt->scsi_cdb, cmd->cmnd, cmd->cmd_len); |
450 | cmd_pkt->byte_count = cpu_to_le32((uint32_t)cmd->request_bufflen); | 437 | cmd_pkt->byte_count = cpu_to_le32((uint32_t)cmd->request_bufflen); |