From: Markus Elfring <elfring@users.sourceforge.net>
Date: Thu, 5 Feb 2015 10:48:26 +0000 (+0100)
Subject: driver core: Delete an unnecessary check before the function call "put_device"
X-Git-Tag: v3.10.105~135
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2348b4879642321a6ba75dfc34c7b3c01035c703;p=thirdparty%2Fkernel%2Fstable.git

driver core: Delete an unnecessary check before the function call "put_device"

commit 5f0163a5ee9cc7c59751768bdfd94a73186debba upstream.

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
[wt: backported only to ease next patch as suggested by Jiri]

Signed-off-by: Willy Tarreau <w@1wt.eu>
---

diff --git a/drivers/base/core.c b/drivers/base/core.c
index 2a19097a7cb19..d92ecf393c382 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -1138,8 +1138,7 @@ done:
 	kobject_del(&dev->kobj);
  Error:
 	cleanup_device_parent(dev);
-	if (parent)
-		put_device(parent);
+	put_device(parent);
 name_error:
 	kfree(dev->p);
 	dev->p = NULL;