Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   poeschel@lemonage.de
To:     Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        "Rafael J. Wysocki" <rafael@kernel.org>,
        linux-kernel@vger.kernel.org (open list)
Cc:     Lars Poeschel <poeschel@lemonage.de>
Subject: [PATCH] driver core: Remove double assignment
Date:   Tue, 29 Sep 2020 13:58:08 +0200
Message-Id: <20200929115808.2815382-1-poeschel@lemonage.de>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Precedence: bulk

From: Lars Poeschel <poeschel@lemonage.de>

This removes an assignment in device_add. It assigned the parent
kobject to the kobject of the  new device. This is not necessary,
because the call to kobject_add a few lines later also does this same
assignment.

Signed-off-by: Lars Poeschel <poeschel@lemonage.de>
---
 drivers/base/core.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/base/core.c b/drivers/base/core.c
index bb5806a2bd4c..03b5396cd192 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -2847,8 +2847,6 @@ int device_add(struct device *dev)
 		error = PTR_ERR(kobj);
 		goto parent_error;
 	}
-	if (kobj)
-		dev->kobj.parent = kobj;
 
 	/* use parent numa_node */
 	if (parent && (dev_to_node(dev) == NUMA_NO_NODE))
@@ -2856,7 +2854,7 @@ int device_add(struct device *dev)
 
 	/* first, register with generic layer. */
 	/* we require the name to be set before, and pass NULL */
-	error = kobject_add(&dev->kobj, dev->kobj.parent, NULL);
+	error = kobject_add(&dev->kobj, kobj, NULL);
 	if (error) {
 		glue_dir = get_glue_dir(dev);
 		goto Error;
-- 
2.28.0