[PATCH] SCSI-OSD: Delete an unnecessary check before the function call "put_disk"

SF Markus Elfring
2015-06-24T14:16:34Z

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Wed, 24 Jun 2015 16:06:21 +0200

The put_disk() 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/osd/osd_uld.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/scsi/osd/osd_uld.c b/drivers/scsi/osd/osd_uld.c
index 243eab3..e2075522 100644
--- a/drivers/scsi/osd/osd_uld.c
+++ b/drivers/scsi/osd/osd_uld.c
@@ -407,9 +407,7 @@ static void __remove(struct device *dev)

OSD_INFO("osd_remove %s\n",
oud->disk ? oud->disk->disk_name : NULL);
-
- if (oud->disk)
- put_disk(oud->disk);
+ put_disk(oud->disk);
ida_remove(&osd_minor_ida, oud->minor);

kfree(oud);
--
2.4.4