scsi: aacraid: remove redundant zero check on ret
authorColin Ian King <colin.king@canonical.com>
Fri, 24 Feb 2017 14:43:30 +0000 (14:43 +0000)
committerMartin K. Petersen <martin.petersen@oracle.com>
Tue, 28 Feb 2017 03:19:43 +0000 (22:19 -0500)
The check for ret being zero is redundant as a few statements earlier we
break out of the while loop if ret is non-zero.  Thus we can remove the
zero check and also the dead-code non-zero case too.

Detected by CoverityScan, CID#1411632 ("Logically Dead Code")

Signed-off-by: Colin Ian King <colin.king@canonical.com>
Acked-by: Dave Carroll <david.carroll@microsemi.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/aacraid/commsup.c

index 1994c7445b54fd4a1932b446886152f693b693f4..a3ad042934870d4bd8bd5ded29a00516156d9168 100644 (file)
@@ -2508,8 +2508,7 @@ int aac_command_thread(void *data)
                         && (now.tv_usec > (1000000 / HZ)))
                                difference = (((1000000 - now.tv_usec) * HZ)
                                  + 500000) / 1000000;
-                       else if (ret == 0) {
-
+                       else {
                                if (now.tv_usec > 500000)
                                        ++now.tv_sec;
 
@@ -2520,9 +2519,6 @@ int aac_command_thread(void *data)
                                        ret = aac_send_hosttime(dev, &now);
 
                                difference = (long)(unsigned)update_interval*HZ;
-                       } else {
-                               /* retry shortly */
-                               difference = 10 * HZ;
                        }
                        next_jiffies = jiffies + difference;
                        if (time_before(next_check_jiffies,next_jiffies))