Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 542d0e58 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'devprop-5.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull device properties framework updates from Rafael Wysocki:
 "Fix the length value used in the PROPERTY_ENTRY_STRING() macro and
  make software nodes use the get_named_child_node() fwnode callback
  (Heikki Krogerus)"

* tag 'devprop-5.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  software node: Implement get_named_child_node fwnode callback
  device property: Fix the length used in PROPERTY_ENTRY_STRING()
parents d276709c 34479820

drivers/base/swnode.c

+23 −0
Original line number Diff line number Diff line
@@ -499,6 +499,28 @@ software_node_get_next_child(const struct fwnode_handle *fwnode, 
	return &c->fwnode;

}



static struct fwnode_handle *

software_node_get_named_child_node(const struct fwnode_handle *fwnode,

				   const char *childname)

{

	struct software_node *swnode = to_software_node(fwnode);

	const struct property_entry *prop;

	struct software_node *child;



	if (!swnode || list_empty(&swnode->children))

		return NULL;



	list_for_each_entry(child, &swnode->children, entry) {

		prop = property_entry_get(child->properties, "name");

		if (!prop)

			continue;

		if (!strcmp(childname, prop->value.str)) {

			kobject_get(&child->kobj);

			return &child->fwnode;

		}

	}

	return NULL;

}



static const struct fwnode_operations software_node_ops = {

	.get = software_node_get,
@@ -508,6 +530,7 @@ static const struct fwnode_operations software_node_ops = { 
	.property_read_string_array = software_node_read_string_array,

	.get_parent = software_node_get_parent,

	.get_next_child_node = software_node_get_next_child,

	.get_named_child_node = software_node_get_named_child_node,

};



/* -------------------------------------------------------------------------- */

include/linux/property.h

+1 −1
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ struct property_entry { 
#define PROPERTY_ENTRY_STRING(_name_, _val_)		\

(struct property_entry) {				\

	.name = _name_,					\

	.length = sizeof(_val_),			\

	.length = sizeof(const char *),			\

	.type = DEV_PROP_STRING,			\

	{ .value = { .str = _val_ } },			\

}