scsi: xen-scsifront: shost_priv() can never return NULL
authorJuergen Gross <jgross@suse.com>
Tue, 22 Aug 2023 06:48:17 +0000 (08:48 +0200)
committerMartin K. Petersen <martin.petersen@oracle.com>
Fri, 25 Aug 2023 02:06:44 +0000 (22:06 -0400)
There is no need to check whether shost_priv() returns a non-NULL value, as
the pointer returned is just an offset to the passed in parameter.

While at it replace an open coded shost_priv() instance.

Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
Signed-off-by: Juergen Gross <jgross@suse.com>
Link: https://lore.kernel.org/r/20230822064817.27257-1-jgross@suse.com
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/xen-scsifront.c

index caae61a..9ec55dd 100644 (file)
@@ -743,7 +743,7 @@ static int scsifront_sdev_configure(struct scsi_device *sdev)
        if (info->host_active == STATE_ERROR)
                return -EIO;
 
-       if (info && current == info->curr) {
+       if (current == info->curr) {
                err = xenbus_printf(XBT_NIL, info->dev->nodename,
                              info->dev_state_path, "%d", XenbusStateConnected);
                if (err) {
@@ -761,7 +761,7 @@ static void scsifront_sdev_destroy(struct scsi_device *sdev)
        struct vscsifrnt_info *info = shost_priv(sdev->host);
        int err;
 
-       if (info && current == info->curr) {
+       if (current == info->curr) {
                err = xenbus_printf(XBT_NIL, info->dev->nodename,
                              info->dev_state_path, "%d", XenbusStateClosed);
                if (err)
@@ -903,7 +903,7 @@ static int scsifront_probe(struct xenbus_device *dev,
                xenbus_dev_fatal(dev, err, "fail to allocate scsi host");
                return err;
        }
-       info = (struct vscsifrnt_info *)host->hostdata;
+       info = shost_priv(host);
 
        dev_set_drvdata(&dev->dev, info);
        info->dev = dev;