* [PATCH] qlcnic: remove redundant zero check on retries counter
@ 2017-09-01 13:44 Colin King
2017-09-01 17:34 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Colin King @ 2017-09-01 13:44 UTC (permalink / raw)
To: Harish Patil, Manish Chopra, Dept-GELinuxNICDev, netdev
Cc: kernel-janitors, linux-kernel
From: Colin Ian King <colin.king@canonical.com>
At the end of the do while loop the integer counter retries will
always be zero and so the subsequent check to see if it is zero
is always true and therefore redundant. Remove the redundant check
and always return -EIO on this return path. Also unbreak the literal
string in dev_err message to clean up a checkpatch warning.
Detected by CoverityScan, CID#744279 ("Logically dead code")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c
index be41e4c77b65..c48a0e2d4d7e 100644
--- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c
+++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c
@@ -592,13 +592,9 @@ qlcnic_receive_peg_ready(struct qlcnic_adapter *adapter)
} while (--retries);
- if (!retries) {
- dev_err(&adapter->pdev->dev, "Receive Peg initialization not "
- "complete, state: 0x%x.\n", val);
- return -EIO;
- }
-
- return 0;
+ dev_err(&adapter->pdev->dev, "Receive Peg initialization not complete, state: 0x%x.\n",
+ val);
+ return -EIO;
}
int
--
2.14.1
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] qlcnic: remove redundant zero check on retries counter
2017-09-01 13:44 [PATCH] qlcnic: remove redundant zero check on retries counter Colin King
@ 2017-09-01 17:34 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2017-09-01 17:34 UTC (permalink / raw)
To: colin.king
Cc: harish.patil, manish.chopra, Dept-GELinuxNICDev, netdev,
kernel-janitors, linux-kernel
From: Colin King <colin.king@canonical.com>
Date: Fri, 1 Sep 2017 14:44:31 +0100
> From: Colin Ian King <colin.king@canonical.com>
>
> At the end of the do while loop the integer counter retries will
> always be zero and so the subsequent check to see if it is zero
> is always true and therefore redundant. Remove the redundant check
> and always return -EIO on this return path. Also unbreak the literal
> string in dev_err message to clean up a checkpatch warning.
>
> Detected by CoverityScan, CID#744279 ("Logically dead code")
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
Applied to net-next, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-09-01 17:34 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-09-01 13:44 [PATCH] qlcnic: remove redundant zero check on retries counter Colin King
2017-09-01 17:34 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).