[PATCH 1/1] SCSI: Deletion of unnecessary checks before the function call "put_device"

SF Markus Elfring
2014-11-20T17:55:14Z

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Thu, 20 Nov 2014 18:48:52 +0100

The put_device() function tests whether its argument is NULL and then
returns immediately. Thus the test around the call is not needed.

This issue was detected by using the Coccinelle software.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
drivers/scsi/hosts.c | 3 +--
drivers/scsi/scsi_sysfs.c | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
index 6de80e3..57afb19 100644
--- a/drivers/scsi/hosts.c
+++ b/drivers/scsi/hosts.c
@@ -337,8 +337,7 @@ static void scsi_host_dev_release(struct device *dev)

kfree(shost->shost_data);

- if (parent)
- put_device(parent);
+ put_device(parent);
kfree(shost);
}

diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c
index 8b4105a..c977c99 100644
--- a/drivers/scsi/scsi_sysfs.c
+++ b/drivers/scsi/scsi_sysfs.c
@@ -426,8 +426,7 @@ static void scsi_device_dev_release_usercontext(struct work_struct *work)
kfree(sdev->inquiry);
kfree(sdev);

- if (parent)
- put_device(parent);
+ put_device(parent);
}

static void scsi_device_dev_release(struct device *dev)
--
2.1.3