[SCSI] ipr: remove an unneeded check
authorDan Carpenter <dan.carpenter@oracle.com>
Mon, 30 Jul 2012 08:18:22 +0000 (11:18 +0300)
committerJames Bottomley <JBottomley@Parallels.com>
Fri, 14 Sep 2012 12:53:26 +0000 (13:53 +0100)
"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>
drivers/scsi/ipr.c

index 7a5ccb2c15657b4bcbc8fe6bede90781e3ca1a49..fc49f173fbb563f808a25e5c90aeb07360ba3701 100644 (file)
@@ -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))) {