openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[SCSI] ipr: remove an unneeded check 

"rc" is always zero here, so there is no need to check.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Acked-by: Brian King <brking@linux.vnet.ibm.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
This commit is contained in:
Dan Carpenter 2012-07-30 11:18:22 +03:00 committed by James Bottomley
parent d995e1b7c0
commit d12f157655
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/scsi/ipr.c
View File

@ -5847,7 +5847,7 @@ static int ipr_queuecommand(struct Scsi_Host *shost,
struct ipr_ioarcb *ioarcb; struct ipr_ioarcb *ioarcb;
struct ipr_cmnd *ipr_cmd; struct ipr_cmnd *ipr_cmd;
unsigned long lock_flags; unsigned long lock_flags;
int rc = 0; int rc;
ioa_cfg = (struct ipr_ioa_cfg *)shost->hostdata; ioa_cfg = (struct ipr_ioa_cfg *)shost->hostdata;
@ -5905,12 +5905,10 @@ static int ipr_queuecommand(struct Scsi_Host *shost,
(!ipr_is_gscsi(res) || scsi_cmd->cmnd[0] == IPR_QUERY_RSRC_STATE)) (!ipr_is_gscsi(res) || scsi_cmd->cmnd[0] == IPR_QUERY_RSRC_STATE))
ioarcb->cmd_pkt.request_type = IPR_RQTYPE_IOACMD; ioarcb->cmd_pkt.request_type = IPR_RQTYPE_IOACMD;
if (likely(rc == 0)) { if (ioa_cfg->sis64)
if (ioa_cfg->sis64) rc = ipr_build_ioadl64(ioa_cfg, ipr_cmd);
rc = ipr_build_ioadl64(ioa_cfg, ipr_cmd); else
else rc = ipr_build_ioadl(ioa_cfg, ipr_cmd);
rc = ipr_build_ioadl(ioa_cfg, ipr_cmd);
}
spin_lock_irqsave(shost->host_lock, lock_flags); spin_lock_irqsave(shost->host_lock, lock_flags);
if (unlikely(rc || (!ioa_cfg->allow_cmds && !ioa_cfg->ioa_is_dead))) { if (unlikely(rc || (!ioa_cfg->allow_cmds && !ioa_cfg->ioa_is_dead))) {