From c959d0c231f7063b14d766cfecc1fe90c2ab5061 Mon Sep 17 00:00:00 2001 From: Heikki Krogerus Date: Fri, 31 May 2019 17:15:35 +0300 Subject: software node: Use kobject name when finding child nodes by name Using the kobject name of the node instead of a device property "name" in software_node_get_named_child_node(). Signed-off-by: Heikki Krogerus Tested-by: Hans de Goede Signed-off-by: Rafael J. Wysocki --- drivers/base/swnode.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'drivers/base/swnode.c') diff --git a/drivers/base/swnode.c b/drivers/base/swnode.c index ef1a48fec718..2d925fc2255f 100644 --- a/drivers/base/swnode.c +++ b/drivers/base/swnode.c @@ -546,17 +546,13 @@ software_node_get_named_child_node(const struct fwnode_handle *fwnode, const char *childname) { struct swnode *swnode = to_swnode(fwnode); - const struct property_entry *prop; struct swnode *child; if (!swnode || list_empty(&swnode->children)) return NULL; list_for_each_entry(child, &swnode->children, entry) { - prop = property_entry_get(child->node->properties, "name"); - if (!prop) - continue; - if (!strcmp(childname, prop->value.str)) { + if (!strcmp(childname, kobject_name(&child->kobj))) { kobject_get(&child->kobj); return &child->fwnode; } -- cgit v1.2.3