> -----Original Message-----
> From: Colin King <colin.king@xxxxxxxxxxxxx>
> Sent: Wednesday, September 26, 2018 6:39 PM
> To: Dept-Eng QLogic Storage Upstream <QLogic-Storage-
> Upstream@xxxxxxxxxx>; James E . J . Bottomley <jejb@xxxxxxxxxxxxxxxxxx>;
> Martin K . Petersen <martin.petersen@xxxxxxxxxx>; linux-scsi@xxxxxxxxxxxxxxx
> Cc: kernel-janitors@xxxxxxxxxxxxxxx; linux-kernel@xxxxxxxxxxxxxxx
> Subject: [PATCH] scsi: qla4xxx: remove redundant check on drvr_wait
>
> External Email
>
> From: Colin Ian King <colin.king@xxxxxxxxxxxxx>
>
> The check for a non-zero drvr_wait is redundant as the same check is performed
> earlier in the outer while loop, the inner check will always be true if we reached
> this point inside the while loop.
> Remove the redundant if check.
>
> Detected by cppcheck:
> (warning) Identical inner 'if' condition is always true.
>
> Signed-off-by: Colin Ian King <colin.king@xxxxxxxxxxxxx>
> ---
> drivers/scsi/qla4xxx/ql4_init.c | 10 ++++------
> 1 file changed, 4 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/scsi/qla4xxx/ql4_init.c b/drivers/scsi/qla4xxx/ql4_init.c index
> 52b1a0bc93c9..1ef74aa2d00a 100644
> --- a/drivers/scsi/qla4xxx/ql4_init.c
> +++ b/drivers/scsi/qla4xxx/ql4_init.c
> @@ -766,12 +766,10 @@ int ql4xxx_lock_drvr_wait(struct scsi_qla_host *a)
> while (drvr_wait) {
> if (ql4xxx_lock_drvr(a) == 0) {
> ssleep(QL4_LOCK_DRVR_SLEEP);
> - if (drvr_wait) {
> - DEBUG2(printk("scsi%ld: %s: Waiting for "
> - "Global Init Semaphore(%d)...\n",
> - a->host_no,
> - __func__, drvr_wait));
> - }
> + DEBUG2(printk("scsi%ld: %s: Waiting for "
> + "Global Init Semaphore(%d)...\n",
> + a->host_no,
> + __func__, drvr_wait));
> drvr_wait -= QL4_LOCK_DRVR_SLEEP;
> } else {
> DEBUG2(printk("scsi%ld: %s: Global Init Semaphore "
> --
> 2.17.1
Thanks,
Acked-by: Manish Rangankar <Manish.Rangankar@xxxxxxxxxx>
