By introducing two temporary variables simplify swnode_register() a bit. No functional change intended. Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx> --- drivers/base/swnode.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/drivers/base/swnode.c b/drivers/base/swnode.c index b0be765b12da..810c27a8c9c1 100644 --- a/drivers/base/swnode.c +++ b/drivers/base/swnode.c @@ -908,6 +908,7 @@ static struct fwnode_handle * swnode_register(const struct software_node *node, struct swnode *parent, unsigned int allocated) { + struct kobject *kobj_parent = parent ? &parent->kobj : NULL; struct swnode *swnode; int ret; @@ -934,12 +935,10 @@ swnode_register(const struct software_node *node, struct swnode *parent, if (node->name) ret = kobject_init_and_add(&swnode->kobj, &software_node_type, - parent ? &parent->kobj : NULL, - "%s", node->name); + kobj_parent, "%s", node->name); else ret = kobject_init_and_add(&swnode->kobj, &software_node_type, - parent ? &parent->kobj : NULL, - "node%d", swnode->id); + kobj_parent, "node%d", swnode->id); if (ret) { kobject_put(&swnode->kobj); return ERR_PTR(ret); -- 2.43.0.rc1.1336.g36b5255a03ac