[PATCH] scsi: snic: Remove redundant assignment to variable ret

[PATCH] scsi: snic: Remove redundant assignment to variable ret

[Colin King]

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

The variable ret is being initialized with a value that is never read,
the assignment is redundant and can be removed.

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

diff --git a/drivers/scsi/snic/snic_scsi.c b/drivers/scsi/snic/snic_scsi.c
index 6dd0ff188bb4..92f5b65c2a27 100644
--- a/drivers/scsi/snic/snic_scsi.c
+++ b/drivers/scsi/snic/snic_scsi.c
@@ -2383,7 +2383,7 @@ snic_host_reset(struct scsi_cmnd *sc)
 {
 	struct Scsi_Host *shost = sc->device->host;
 	u32 start_time  = jiffies;
-	int ret = FAILED;
+	int ret;
 
 	SNIC_SCSI_DBG(shost,
 		      "host reset:sc %p sc_cmd 0x%x req %p tag %d flags 0x%llx\n",
-- 
2.31.1

Re: [PATCH] scsi: snic: Remove redundant assignment to variable ret

[Martin K. Petersen]

Colin,

> The variable ret is being initialized with a value that is never read,
> the assignment is redundant and can be removed.

Applied to 5.15/scsi-staging, thanks!

-- 
Martin K. Petersen	Oracle Linux Engineering

Re: [PATCH] scsi: snic: Remove redundant assignment to variable ret

[Martin K. Petersen]

On Fri, 6 Aug 2021 12:23:13 +0100, Colin King wrote:

> From: Colin Ian King <colin.king@canonical.com>
> 
> The variable ret is being initialized with a value that is never read,
> the assignment is redundant and can be removed.
> 
> 
> 
> [...]

Applied to 5.15/scsi-queue, thanks!

[1/1] scsi: snic: Remove redundant assignment to variable ret
      https://git.kernel.org/mkp/scsi/c/e9b1adb7c5e3

-- 
Martin K. Petersen	Oracle Linux Engineering

Re: [PATCH] scsi: snic: remove redundant assignment to variable ret

[Dan Carpenter]

On Wed, Jul 31, 2019 at 11:49:50PM +0100, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
> 
> Variable ret is being assigned with a value that is never read as
> there is return statement immediately afterwards.  The assignment
> is redundant and hence can be removed.
> 
> Addresses-Coverity: ("Unused value")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>  drivers/scsi/snic/snic_disc.c | 2 --
>  1 file changed, 2 deletions(-)
> 
> diff --git a/drivers/scsi/snic/snic_disc.c b/drivers/scsi/snic/snic_disc.c
> index e9ccfb97773f..d89c75991323 100644
> --- a/drivers/scsi/snic/snic_disc.c
> +++ b/drivers/scsi/snic/snic_disc.c
> @@ -261,8 +261,6 @@ snic_tgt_create(struct snic *snic, struct snic_tgt_id *tgtid)
>  	tgt = kzalloc(sizeof(*tgt), GFP_KERNEL);
>  	if (!tgt) {
>  		SNIC_HOST_ERR(snic->shost, "Failure to allocate snic_tgt.\n");
> -		ret = -ENOMEM;
> -
>  		return tgt;

Not related to this patch, but it would be nicer to return NULL instead
of tgt.  It's the same but the literal is nicer.  No need for the error
message after a kmalloc failure either.

	tgt = kzalloc(sizeof(*tgt), GFP_KERNEL);
	if (!tgt)
		return NULL;

regards,
dan carpenter

[PATCH] scsi: snic: remove redundant assignment to variable ret

[Colin King]

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

Variable ret is being assigned with a value that is never read as
there is return statement immediately afterwards.  The assignment
is redundant and hence can be removed.

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

diff --git a/drivers/scsi/snic/snic_disc.c b/drivers/scsi/snic/snic_disc.c
index e9ccfb97773f..d89c75991323 100644
--- a/drivers/scsi/snic/snic_disc.c
+++ b/drivers/scsi/snic/snic_disc.c
@@ -261,8 +261,6 @@ snic_tgt_create(struct snic *snic, struct snic_tgt_id *tgtid)
 	tgt = kzalloc(sizeof(*tgt), GFP_KERNEL);
 	if (!tgt) {
 		SNIC_HOST_ERR(snic->shost, "Failure to allocate snic_tgt.\n");
-		ret = -ENOMEM;
-
 		return tgt;
 	}
 
-- 
2.20.1