[PATCH] scsi: aacraid: remove redundant zero check on ret

[PATCH] scsi: aacraid: remove redundant zero check on ret

[Colin King]

From: Colin Ian King <colin.king@canonical.com>

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>
---
 drivers/scsi/aacraid/commsup.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c
index 1994c74..a3ad042 100644
--- a/drivers/scsi/aacraid/commsup.c
+++ b/drivers/scsi/aacraid/commsup.c
@@ -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))
-- 
2.10.2

RE: [PATCH] scsi: aacraid: remove redundant zero check on ret

[Dave Carroll]

> -----Original Message-----
> From: Colin King [mailto:colin.king@canonical.com]
> Sent: Friday, February 24, 2017 7:44 AM
> To: dl-esc-Aacraid Linux Driver; James E . J . Bottomley; Martin K .
> Petersen; linux-scsi@vger.kernel.org
> Cc: kernel-janitors@vger.kernel.org; linux-kernel@vger.kernel.org
> Subject: [PATCH] scsi: aacraid: remove redundant zero check on ret
> 
> From: Colin Ian King <colin.king@canonical.com>
> 
> 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>
> ---
>  drivers/scsi/aacraid/commsup.c | 6 +-----
>  1 file changed, 1 insertion(+), 5 deletions(-)

Acked-by: Dave Carroll <david.carroll@microsemi.com>

Re: [PATCH] scsi: aacraid: remove redundant zero check on ret

[Martin K. Petersen]

>>>>> "Colin" == Colin King <colin.king@canonical.com> writes:

Colin,

Colin> The check for ret being zero is redundant as a few statements
Colin> earlier we break out of the while loop if ret is non-zero.  Thus
Colin> we can remove the zero check and also the dead-code non-zero case
Colin> too.

Applied to 4.11/scsi-fixes.

-- 
Martin K. Petersen	Oracle Linux Engineering