diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2012-07-30 11:18:22 +0300 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2012-09-14 13:53:26 +0100 |
| commit | d12f157655b9114e4afbf4d5ff7b094874456614 (patch) | |
| tree | b744b78031bcb67cb7f35fb8205fea8ea5e880b2 /drivers/scsi/ipr.c | |
| parent | d995e1b7c0e92af038d9ac322e35b3caaf905b10 (diff) | |
| download | blackbird-op-linux-d12f157655b9114e4afbf4d5ff7b094874456614.tar.gz blackbird-op-linux-d12f157655b9114e4afbf4d5ff7b094874456614.zip | |
[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>
Diffstat (limited to 'drivers/scsi/ipr.c')
| -rw-r--r-- | drivers/scsi/ipr.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c index 7a5ccb2c1565..fc49f173fbb5 100644 --- a/drivers/scsi/ipr.c +++ b/drivers/scsi/ipr.c @@ -5847,7 +5847,7 @@ static int ipr_queuecommand(struct Scsi_Host *shost, struct ipr_ioarcb *ioarcb; struct ipr_cmnd *ipr_cmd; unsigned long lock_flags; - int rc = 0; + int rc; 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)) ioarcb->cmd_pkt.request_type = IPR_RQTYPE_IOACMD; - if (likely(rc == 0)) { - if (ioa_cfg->sis64) - rc = ipr_build_ioadl64(ioa_cfg, ipr_cmd); - else - rc = ipr_build_ioadl(ioa_cfg, ipr_cmd); - } + if (ioa_cfg->sis64) + rc = ipr_build_ioadl64(ioa_cfg, ipr_cmd); + else + rc = ipr_build_ioadl(ioa_cfg, ipr_cmd); spin_lock_irqsave(shost->host_lock, lock_flags); if (unlikely(rc || (!ioa_cfg->allow_cmds && !ioa_cfg->ioa_is_dead))) { |
