Skip to contentSkip to conversation

software node: Simplify swnode_register() a bit

PATCH In review Andy Shevchenko 3 participants 4 messages Sep 13, 2024

Subsystems (3)
lore
Share & tools
lore

Andy Shevchenko

author reviewer
#0 lore raw

PATCH 1/1 software node: Simplify swnode_register() a bit

By introducing two temporary variables simplify swnode_register() a bit. No functional change intended.

---
 drivers/base/swnode.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/base/swnode.c +3 -4
index b0be765b12da..810c27a8c9c1 100644
@@ -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);
Signature · 1 line
2.43.0.rc1.1336.g36b5255a03ac
#2 lore raw
In reply to Andy Shevchenko
Quoted 13 lines · Andy Shevchenko

By introducing two temporary variables simplify swnode_register() a bit. No functional change intended.

---
 drivers/base/swnode.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/base/swnode.c +0 -0
index b0be765b12da..810c27a8c9c1 100644

drivers/base/swnode.c static struct fwnode_handle * · line 911

Quoted 4 lines
drivers/base/swnode.c +1 -0
@@ -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;

I despise ?: use just so much, EXCEPT for when it's used in something like this:

drivers/base/swnode.c swnode_register(const struct software_node *node, struct swnode *parent, · line 938

Quoted 10 lines
drivers/base/swnode.c +1 -2
 	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);

Which really is the only valid way I'd put up with it :)

So can you rewrite the change above to be just:

	struct kobject *kobj_parent = NULL;

	...

	if (parent)
		kobj_parent = &parent->kobj;

Which is much simpler to read, right?

thanks,

greg k-h

author reviewer
#3 lore raw
Quoted 1 line · Greg Kroah-Hartman

On Fri, Sep 13, 2024 at 02:05:23PM +0300, Andy Shevchenko wrote:

...

Quoted 11 lines

drivers/base/swnode.c static struct fwnode_handle * · line 911

Quoted 1 line
drivers/base/swnode.c +1 -0
+	struct kobject *kobj_parent = parent ? &parent->kobj : NULL;

I despise ?: use just so much, EXCEPT for when it's used in something like this:

drivers/base/swnode.c swnode_register(const struct software_node *node, struct swnode *parent, · line 938

Quoted 4 lines
drivers/base/swnode.c +1 -2
 		ret = kobject_init_and_add(&swnode->kobj, &software_node_type,
-					   parent ? &parent->kobj : NULL,
-					   "%s", node->name);
+					   kobj_parent, "%s", node->name);

Which really is the only valid way I'd put up with it :)

I see your point!

Quoted 10 lines

So can you rewrite the change above to be just:

	struct kobject *kobj_parent = NULL;

	...

	if (parent)
		kobj_parent = &parent->kobj;

Which is much simpler to read, right?

Yeah, but the point of the patch seems to be diminished. Let's just not continue with it for now. Maybe later it will make more sense.

Thank you for the review!

Signature · 2 lines
With Best Regards,
Andy Shevchenko