[PATCH] scsi: qla4xxx: remove redundant check on drvr_wait

[PATCH] scsi: qla4xxx: remove redundant check on drvr_wait

[Colin King]

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

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@canonical.com>
---
 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

[PATCH] scsi: qla4xxx: remove redundant check on drvr_wait

[Colin King]

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

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@canonical.com>
---
 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

RE: [PATCH] scsi: qla4xxx: remove redundant check on drvr_wait

[Rangankar, Manish]

DQo+IC0tLS0tT3JpZ2luYWwgTWVzc2FnZS0tLS0tDQo+IEZyb206IENvbGluIEtpbmcgPGNvbGlu
LmtpbmdAY2Fub25pY2FsLmNvbT4NCj4gU2VudDogV2VkbmVzZGF5LCBTZXB0ZW1iZXIgMjYsIDIw
MTggNjozOSBQTQ0KPiBUbzogRGVwdC1FbmcgUUxvZ2ljIFN0b3JhZ2UgVXBzdHJlYW0gPFFMb2dp
Yy1TdG9yYWdlLQ0KPiBVcHN0cmVhbUBjYXZpdW0uY29tPjsgSmFtZXMgRSAuIEogLiBCb3R0b21s
ZXkgPGplamJAbGludXgudm5ldC5pYm0uY29tPjsNCj4gTWFydGluIEsgLiBQZXRlcnNlbiA8bWFy
dGluLnBldGVyc2VuQG9yYWNsZS5jb20+OyBsaW51eC1zY3NpQHZnZXIua2VybmVsLm9yZw0KPiBD
Yzoga2VybmVsLWphbml0b3JzQHZnZXIua2VybmVsLm9yZzsgbGludXgta2VybmVsQHZnZXIua2Vy
bmVsLm9yZw0KPiBTdWJqZWN0OiBbUEFUQ0hdIHNjc2k6IHFsYTR4eHg6IHJlbW92ZSByZWR1bmRh
bnQgY2hlY2sgb24gZHJ2cl93YWl0DQo+IA0KPiBFeHRlcm5hbCBFbWFpbA0KPiANCj4gRnJvbTog
Q29saW4gSWFuIEtpbmcgPGNvbGluLmtpbmdAY2Fub25pY2FsLmNvbT4NCj4gDQo+IFRoZSBjaGVj
ayBmb3IgYSBub24temVybyBkcnZyX3dhaXQgaXMgcmVkdW5kYW50IGFzIHRoZSBzYW1lIGNoZWNr
IGlzIHBlcmZvcm1lZA0KPiBlYXJsaWVyIGluIHRoZSBvdXRlciB3aGlsZSBsb29wLCB0aGUgaW5u
ZXIgY2hlY2sgd2lsbCBhbHdheXMgYmUgdHJ1ZSBpZiB3ZSByZWFjaGVkDQo+IHRoaXMgcG9pbnQg
aW5zaWRlIHRoZSB3aGlsZSBsb29wLg0KPiBSZW1vdmUgdGhlIHJlZHVuZGFudCBpZiBjaGVjay4N
Cj4gDQo+IERldGVjdGVkIGJ5IGNwcGNoZWNrOg0KPiAod2FybmluZykgSWRlbnRpY2FsIGlubmVy
ICdpZicgY29uZGl0aW9uIGlzIGFsd2F5cyB0cnVlLg0KPiANCj4gU2lnbmVkLW9mZi1ieTogQ29s
aW4gSWFuIEtpbmcgPGNvbGluLmtpbmdAY2Fub25pY2FsLmNvbT4NCj4gLS0tDQo+ICBkcml2ZXJz
L3Njc2kvcWxhNHh4eC9xbDRfaW5pdC5jIHwgMTAgKysrKy0tLS0tLQ0KPiAgMSBmaWxlIGNoYW5n
ZWQsIDQgaW5zZXJ0aW9ucygrKSwgNiBkZWxldGlvbnMoLSkNCj4gDQo+IGRpZmYgLS1naXQgYS9k
cml2ZXJzL3Njc2kvcWxhNHh4eC9xbDRfaW5pdC5jIGIvZHJpdmVycy9zY3NpL3FsYTR4eHgvcWw0
X2luaXQuYyBpbmRleA0KPiA1MmIxYTBiYzkzYzkuLjFlZjc0YWEyZDAwYSAxMDA2NDQNCj4gLS0t
IGEvZHJpdmVycy9zY3NpL3FsYTR4eHgvcWw0X2luaXQuYw0KPiArKysgYi9kcml2ZXJzL3Njc2kv
cWxhNHh4eC9xbDRfaW5pdC5jDQo+IEBAIC03NjYsMTIgKzc2NiwxMCBAQCBpbnQgcWw0eHh4X2xv
Y2tfZHJ2cl93YWl0KHN0cnVjdCBzY3NpX3FsYV9ob3N0ICphKQ0KPiAgICAgICAgIHdoaWxlIChk
cnZyX3dhaXQpIHsNCj4gICAgICAgICAgICAgICAgIGlmIChxbDR4eHhfbG9ja19kcnZyKGEpID09
IDApIHsNCj4gICAgICAgICAgICAgICAgICAgICAgICAgc3NsZWVwKFFMNF9MT0NLX0RSVlJfU0xF
RVApOw0KPiAtICAgICAgICAgICAgICAgICAgICAgICBpZiAoZHJ2cl93YWl0KSB7DQo+IC0gICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgREVCVUcyKHByaW50aygic2NzaSVsZDogJXM6IFdh
aXRpbmcgZm9yICINCj4gLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICJHbG9iYWwgSW5pdCBTZW1hcGhvcmUoJWQpLi4uXG4iLA0KPiAtICAgICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYS0+aG9zdF9ubywNCj4gLSAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIF9fZnVuY19fLCBkcnZyX3dhaXQpKTsN
Cj4gLSAgICAgICAgICAgICAgICAgICAgICAgfQ0KPiArICAgICAgICAgICAgICAgICAgICAgICBE
RUJVRzIocHJpbnRrKCJzY3NpJWxkOiAlczogV2FpdGluZyBmb3IgIg0KPiArICAgICAgICAgICAg
ICAgICAgICAgICAgICAgICAgICAgICAgICJHbG9iYWwgSW5pdCBTZW1hcGhvcmUoJWQpLi4uXG4i
LA0KPiArICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGEtPmhvc3Rfbm8sDQo+
ICsgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgX19mdW5jX18sIGRydnJfd2Fp
dCkpOw0KPiAgICAgICAgICAgICAgICAgICAgICAgICBkcnZyX3dhaXQgLT0gUUw0X0xPQ0tfRFJW
Ul9TTEVFUDsNCj4gICAgICAgICAgICAgICAgIH0gZWxzZSB7DQo+ICAgICAgICAgICAgICAgICAg
ICAgICAgIERFQlVHMihwcmludGsoInNjc2klbGQ6ICVzOiBHbG9iYWwgSW5pdCBTZW1hcGhvcmUg
Ig0KPiAtLQ0KPiAyLjE3LjENCg0KVGhhbmtzLA0KDQpBY2tlZC1ieTogTWFuaXNoIFJhbmdhbmth
ciA8TWFuaXNoLlJhbmdhbmthckBjYXZpdW0uY29tPg0K

RE: [PATCH] scsi: qla4xxx: remove redundant check on drvr_wait

[Rangankar, Manish]

> -----Original Message-----
> From: Colin King <colin.king@canonical.com>
> Sent: Wednesday, September 26, 2018 6:39 PM
> To: Dept-Eng QLogic Storage Upstream <QLogic-Storage-
> Upstream@cavium.com>; James E . J . Bottomley <jejb@linux.vnet.ibm.com>;
> Martin K . Petersen <martin.petersen@oracle.com>; linux-scsi@vger.kernel.org
> Cc: kernel-janitors@vger.kernel.org; linux-kernel@vger.kernel.org
> Subject: [PATCH] scsi: qla4xxx: remove redundant check on drvr_wait
> 
> External Email
> 
> From: Colin Ian King <colin.king@canonical.com>
> 
> 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@canonical.com>
> ---
>  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@cavium.com>

[PATCH] scsi: qla4xxx: remove redundant assignment to variable rval

[Colin King]

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

The variable rval is being initialized with a value that is never read
and it is being updated later with a new value.  The initialization is
redundant and can be removed.

Addresses-Coverity: ("Unused value")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 drivers/scsi/qla4xxx/ql4_nx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/scsi/qla4xxx/ql4_nx.c b/drivers/scsi/qla4xxx/ql4_nx.c
index fd30fbd0d33c..e6e35e6958f6 100644
--- a/drivers/scsi/qla4xxx/ql4_nx.c
+++ b/drivers/scsi/qla4xxx/ql4_nx.c
@@ -1767,7 +1767,7 @@ qla4_82xx_start_firmware(struct scsi_qla_host *ha, uint32_t image_start)
 
 int qla4_82xx_try_start_fw(struct scsi_qla_host *ha)
 {
-	int rval = QLA_ERROR;
+	int rval;
 
 	/*
 	 * FW Load priority:
-- 
2.29.2

[PATCH] scsi: qla4xxx: remove redundant assignment to variable rval

[Colin King]

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

The variable rval is being initialized with a value that is never read
and it is being updated later with a new value.  The initialization is
redundant and can be removed.

Addresses-Coverity: ("Unused value")
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 drivers/scsi/qla4xxx/ql4_nx.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/scsi/qla4xxx/ql4_nx.c b/drivers/scsi/qla4xxx/ql4_nx.c
index fd30fbd0d33c..e6e35e6958f6 100644
--- a/drivers/scsi/qla4xxx/ql4_nx.c
+++ b/drivers/scsi/qla4xxx/ql4_nx.c
@@ -1767,7 +1767,7 @@ qla4_82xx_start_firmware(struct scsi_qla_host *ha, uint32_t image_start)
 
 int qla4_82xx_try_start_fw(struct scsi_qla_host *ha)
 {
-	int rval = QLA_ERROR;
+	int rval;
 
 	/*
 	 * FW Load priority:
-- 
2.29.2

Re: [PATCH] scsi: qla4xxx: remove redundant assignment to variable rval

[Martin K. Petersen]

Colin,

> The variable rval is being initialized with a value that is never read
> and it is being updated later with a new value.  The initialization is
> redundant and can be removed.

Applied to 5.11/scsi-staging, thanks!

-- 
Martin K. Petersen	Oracle Linux Engineering

Re: [PATCH] scsi: qla4xxx: remove redundant assignment to variable rval

[Martin K. Petersen]

Colin,

> The variable rval is being initialized with a value that is never read
> and it is being updated later with a new value.  The initialization is
> redundant and can be removed.

Applied to 5.11/scsi-staging, thanks!

-- 
Martin K. Petersen	Oracle Linux Engineering

Re: [PATCH] scsi: qla4xxx: remove redundant assignment to variable rval

[Martin K. Petersen]

On Fri, 4 Dec 2020 19:18:10 +0000, Colin King wrote:

> The variable rval is being initialized with a value that is never read
> and it is being updated later with a new value.  The initialization is
> redundant and can be removed.

Applied to 5.11/scsi-queue, thanks!

[1/1] scsi: qla4xxx: remove redundant assignment to variable rval
      https://git.kernel.org/mkp/scsi/c/3a5b9fa2cc5f

-- 
Martin K. Petersen	Oracle Linux Engineering

Re: [PATCH] scsi: qla4xxx: remove redundant assignment to variable rval

[Martin K. Petersen]

On Fri, 4 Dec 2020 19:18:10 +0000, Colin King wrote:

> The variable rval is being initialized with a value that is never read
> and it is being updated later with a new value.  The initialization is
> redundant and can be removed.

Applied to 5.11/scsi-queue, thanks!

[1/1] scsi: qla4xxx: remove redundant assignment to variable rval
      https://git.kernel.org/mkp/scsi/c/3a5b9fa2cc5f

-- 
Martin K. Petersen	Oracle Linux Engineering

Re: [PATCH] scsi: qla4xxx: remove redundant check on drvr_wait

[Martin K. Petersen]

Colin,

> 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.

Applied to 4.20/scsi-queue. Thanks!

-- 
Martin K. Petersen	Oracle Linux Engineering

Re: [PATCH] scsi: qla4xxx: remove redundant check on drvr_wait

[Martin K. Petersen]

Colin,

> 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.

Applied to 4.20/scsi-queue. Thanks!

-- 
Martin K. Petersen	Oracle Linux Engineering