diff options
author | Colin Ian King <colin.king@canonical.com> | 2017-02-24 09:43:30 -0500 |
---|---|---|
committer | Martin K. Petersen <martin.petersen@oracle.com> | 2017-02-27 22:19:43 -0500 |
commit | fbdab3e7fd547e1ce558db1521659707bdf02cc6 (patch) | |
tree | 22cc39a271f2175a56f22b1ce8a56cbeb2b11e07 | |
parent | 825c6abbc316f496cd2b66e1fa72892cf4b49a9f (diff) |
scsi: aacraid: remove redundant zero check on ret
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>
-rw-r--r-- | drivers/scsi/aacraid/commsup.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c index 1994c7445b54..a3ad04293487 100644 --- a/drivers/scsi/aacraid/commsup.c +++ b/drivers/scsi/aacraid/commsup.c | |||
@@ -2508,8 +2508,7 @@ int aac_command_thread(void *data) | |||
2508 | && (now.tv_usec > (1000000 / HZ))) | 2508 | && (now.tv_usec > (1000000 / HZ))) |
2509 | difference = (((1000000 - now.tv_usec) * HZ) | 2509 | difference = (((1000000 - now.tv_usec) * HZ) |
2510 | + 500000) / 1000000; | 2510 | + 500000) / 1000000; |
2511 | else if (ret == 0) { | 2511 | else { |
2512 | |||
2513 | if (now.tv_usec > 500000) | 2512 | if (now.tv_usec > 500000) |
2514 | ++now.tv_sec; | 2513 | ++now.tv_sec; |
2515 | 2514 | ||
@@ -2520,9 +2519,6 @@ int aac_command_thread(void *data) | |||
2520 | ret = aac_send_hosttime(dev, &now); | 2519 | ret = aac_send_hosttime(dev, &now); |
2521 | 2520 | ||
2522 | difference = (long)(unsigned)update_interval*HZ; | 2521 | difference = (long)(unsigned)update_interval*HZ; |
2523 | } else { | ||
2524 | /* retry shortly */ | ||
2525 | difference = 10 * HZ; | ||
2526 | } | 2522 | } |
2527 | next_jiffies = jiffies + difference; | 2523 | next_jiffies = jiffies + difference; |
2528 | if (time_before(next_check_jiffies,next_jiffies)) | 2524 | if (time_before(next_check_jiffies,next_jiffies)) |