2020-11-03 11:59:50

by Jing Xiangfeng

Subject: [PATCH] scsi: qla4xxx: Remove redundant assignment to variable rval

The variable rval has been initialized with 'QLA_ERROR'. The assignment
is redundant in an error path. So remove it.

Signed-off-by: Jing Xiangfeng <[email protected]>
---
drivers/scsi/qla4xxx/ql4_os.c | 3 ---
1 file changed, 3 deletions(-)

diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index 676778cbc550..aaccbf71dff5 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -686,7 +686,6 @@ static int qla4xxx_get_chap_by_index(struct scsi_qla_host *ha,

if (!ha->chap_list) {
ql4_printk(KERN_ERR, ha, "CHAP table cache is empty!\n");
- rval = QLA_ERROR;
goto exit_get_chap;
}

@@ -698,14 +697,12 @@ static int qla4xxx_get_chap_by_index(struct scsi_qla_host *ha,

if (chap_index > max_chap_entries) {
ql4_printk(KERN_ERR, ha, "Invalid Chap index\n");
- rval = QLA_ERROR;
goto exit_get_chap;
}

*chap_entry = (struct ql4_chap_table *)ha->chap_list + chap_index;
if ((*chap_entry)->cookie !=
__constant_cpu_to_le16(CHAP_VALID_COOKIE)) {
- rval = QLA_ERROR;
*chap_entry = NULL;
} else {
rval = QLA_SUCCESS;
--
2.17.1

2020-11-17 05:58:00

by Martin K. Petersen

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

Jing,

> The variable rval has been initialized with 'QLA_ERROR'. The
> assignment is redundant in an error path. So remove it.

Applied to 5.11/scsi-staging, thanks!

--
Martin K. Petersen Oracle Linux Engineering

2020-11-20 03:33:46

by Martin K. Petersen

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

On Tue, 3 Nov 2020 20:01:37 +0800, Jing Xiangfeng wrote:

> The variable rval has been initialized with 'QLA_ERROR'. The assignment
> is redundant in an error path. So remove it.

Applied to 5.11/scsi-queue, thanks!

[1/1] scsi: qla4xxx: Remove redundant assignment to variable rval
https://git.kernel.org/mkp/scsi/c/cf4d4d8ebdb8

--
Martin K. Petersen Oracle Linux Engineering