]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
drivers/scsi/ipr.c: remove an unneeded check
authorDan Carpenter <dan.carpenter@oracle.com>
Fri, 7 Sep 2012 00:17:57 +0000 (10:17 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 7 Sep 2012 05:36:07 +0000 (15:36 +1000)
"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>
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
drivers/scsi/ipr.c

index ae1296749365242ee3326bd7d5b4336315f39666..e3a19e6510e04a033cbef67ca38519585a0193e4 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))) {