diff mbox series

scsi: target: vhost-scsi: remove redundant initialization of variable ret

Message ID 20210303134339.67339-1-colin.king@canonical.com (mailing list archive)
State New, archived
Headers show
Series scsi: target: vhost-scsi: remove redundant initialization of variable ret | expand

Commit Message

Colin King March 3, 2021, 1:43 p.m. UTC
From: Colin Ian King <colin.king@canonical.com>

The variable ret 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/vhost/scsi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Stefan Hajnoczi March 4, 2021, 5:15 p.m. UTC | #1
On Wed, Mar 03, 2021 at 01:43:39PM +0000, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
> 
> The variable ret 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/vhost/scsi.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Which kernel version is this patch based on?

If it's a fix for a patch that hasn't landed yet, please indicate this.
A "Fixes: ..." tag should be added to this patch as well.

I looked at linux.git/master commit f69d02e37a85645aa90d18cacfff36dba370f797 and see this:

  static int __init vhost_scsi_init(void)
  {
          int ret = -ENOMEM;

          pr_debug("TCM_VHOST fabric module %s on %s/%s"
                  " on "UTS_RELEASE"\n", VHOST_SCSI_VERSION, utsname()->sysname,
                  utsname()->machine);

          /*
           * Use our own dedicated workqueue for submitting I/O into
           * target core to avoid contention within system_wq.
           */
          vhost_scsi_workqueue = alloc_workqueue("vhost_scsi", 0, 0);
          if (!vhost_scsi_workqueue)
                  goto out;

We need ret's initialization value here ^

          ret = vhost_scsi_register();
          if (ret < 0)
                  goto out_destroy_workqueue;

          ret = target_register_template(&vhost_scsi_ops);
          if (ret < 0)
                  goto out_vhost_scsi_deregister;

          return 0;

  out_vhost_scsi_deregister:
          vhost_scsi_deregister();
  out_destroy_workqueue:
          destroy_workqueue(vhost_scsi_workqueue);
  out:
          return ret;
  };


> 
> diff --git a/drivers/vhost/scsi.c b/drivers/vhost/scsi.c
> index d16c04dcc144..9129ab8187fd 100644
> --- a/drivers/vhost/scsi.c
> +++ b/drivers/vhost/scsi.c
> @@ -2465,7 +2465,7 @@ static const struct target_core_fabric_ops vhost_scsi_ops = {
>  
>  static int __init vhost_scsi_init(void)
>  {
> -	int ret = -ENOMEM;
> +	int ret;
>  
>  	pr_debug("TCM_VHOST fabric module %s on %s/%s"
>  		" on "UTS_RELEASE"\n", VHOST_SCSI_VERSION, utsname()->sysname,
> -- 
> 2.30.0
>
diff mbox series

Patch

diff --git a/drivers/vhost/scsi.c b/drivers/vhost/scsi.c
index d16c04dcc144..9129ab8187fd 100644
--- a/drivers/vhost/scsi.c
+++ b/drivers/vhost/scsi.c
@@ -2465,7 +2465,7 @@  static const struct target_core_fabric_ops vhost_scsi_ops = {
 
 static int __init vhost_scsi_init(void)
 {
-	int ret = -ENOMEM;
+	int ret;
 
 	pr_debug("TCM_VHOST fabric module %s on %s/%s"
 		" on "UTS_RELEASE"\n", VHOST_SCSI_VERSION, utsname()->sysname,