aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/lpfc/lpfc_scsi.c
diff options
context:
space:
mode:
authorJames.Smart@Emulex.Com <James.Smart@Emulex.Com>2005-10-28 20:29:47 -0400
committerJames Bottomley <jejb@mulgrave.(none)>2005-10-29 11:29:09 -0400
commit68876920f442912c94f749bc337c888696cb9ed0 (patch)
tree12fe1c63be2fedad13706b4b14d46c90c94cce49 /drivers/scsi/lpfc/lpfc_scsi.c
parent604a3e3042eb89ffaa4f735ef9208281aae786c7 (diff)
[SCSI] lpfc: Replace lpfc_sli_issue_iocb_wait_high_priority
Replace lpfc_sli_issue_iocb_wait_high_priority with lpfc_sli_issue_iocb_wait. Simplify code paths, as there really wasn't a "priority" Signed-off-by: James Smart <James.Smart@emulex.com> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/lpfc/lpfc_scsi.c')
-rw-r--r--drivers/scsi/lpfc/lpfc_scsi.c19
1 files changed, 6 insertions, 13 deletions
diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
index 51c6b677490..c993069a650 100644
--- a/drivers/scsi/lpfc/lpfc_scsi.c
+++ b/drivers/scsi/lpfc/lpfc_scsi.c
@@ -637,12 +637,9 @@ lpfc_scsi_tgt_reset(struct lpfc_scsi_buf * lpfc_cmd, struct lpfc_hba * phba)
637 if (!iocbqrsp) 637 if (!iocbqrsp)
638 return FAILED; 638 return FAILED;
639 639
640 iocbq->iocb_flag |= LPFC_IO_POLL; 640 ret = lpfc_sli_issue_iocb_wait(phba,
641 ret = lpfc_sli_issue_iocb_wait_high_priority(phba, 641 &phba->sli.ring[phba->sli.fcp_ring],
642 &phba->sli.ring[phba->sli.fcp_ring], 642 iocbq, iocbqrsp, lpfc_cmd->timeout);
643 iocbq, SLI_IOCB_HIGH_PRIORITY,
644 iocbqrsp,
645 lpfc_cmd->timeout);
646 if (ret != IOCB_SUCCESS) { 643 if (ret != IOCB_SUCCESS) {
647 lpfc_cmd->status = IOSTAT_DRIVER_REJECT; 644 lpfc_cmd->status = IOSTAT_DRIVER_REJECT;
648 ret = FAILED; 645 ret = FAILED;
@@ -922,7 +919,6 @@ __lpfc_reset_lun_handler(struct scsi_cmnd *cmnd)
922{ 919{
923 struct Scsi_Host *shost = cmnd->device->host; 920 struct Scsi_Host *shost = cmnd->device->host;
924 struct lpfc_hba *phba = (struct lpfc_hba *)shost->hostdata[0]; 921 struct lpfc_hba *phba = (struct lpfc_hba *)shost->hostdata[0];
925 struct lpfc_sli *psli = &phba->sli;
926 struct lpfc_scsi_buf *lpfc_cmd = NULL; 922 struct lpfc_scsi_buf *lpfc_cmd = NULL;
927 struct list_head *scsi_buf_list = &phba->lpfc_scsi_buf_list; 923 struct list_head *scsi_buf_list = &phba->lpfc_scsi_buf_list;
928 struct list_head *lpfc_iocb_list = &phba->lpfc_iocb_list; 924 struct list_head *lpfc_iocb_list = &phba->lpfc_iocb_list;
@@ -969,12 +965,9 @@ __lpfc_reset_lun_handler(struct scsi_cmnd *cmnd)
969 if (iocbqrsp == NULL) 965 if (iocbqrsp == NULL)
970 goto out_free_scsi_buf; 966 goto out_free_scsi_buf;
971 967
972 iocbq->iocb_flag |= LPFC_IO_POLL; 968 ret = lpfc_sli_issue_iocb_wait(phba,
973 iocbq->iocb_cmpl = lpfc_sli_wake_iocb_high_priority; 969 &phba->sli.ring[phba->sli.fcp_ring],
974 970 iocbq, iocbqrsp, lpfc_cmd->timeout);
975 ret = lpfc_sli_issue_iocb_wait_high_priority(phba,
976 &phba->sli.ring[psli->fcp_ring],
977 iocbq, 0, iocbqrsp, 60);
978 if (ret == IOCB_SUCCESS) 971 if (ret == IOCB_SUCCESS)
979 ret = SUCCESS; 972 ret = SUCCESS;
980 973