mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 16:29:59 +00:00
Device properties framework updates for 5.1-rc1
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). -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAABCAAGBQJcfSKaAAoJEILEb/54YlRxXpwP/Rs1YQwpx1gZwSxERMBrarc3 ifbi8cvCzVcryO+nup6vTxci9BxX3LHf6tzB8c9PCYezaOcZYZwBhNGr0w3W2GK6 FomuNeQ3KIgzsLgBEdfL8xtHbb3DB7PrfWRj6zvkzX1P0tjcVV5QQNd+thqt6Bd1 8igWVrnjR9a8hlQ/lHKSU8LZPEyA8IiJviwBpd+22CuGtwNSRa+ShUdqmz26pY+R Ias7/0EDUSSW7OdVfGn6NFDz3lGccQZ3CQ3ZwkRSvjdAg8oe0bbnn3ymQgOX7bfx KmWXbsO4vXw0KArnf6/hwYJdubJuUjFMEQ7QKSDP9UYNCEz4qZn2Gr0RLUAK06NC 7oklm0ThYn88o5RHXWTmHU4rmJ6WBKp8cyr5e/KGkDKFPexZmpKW6r7zkX6DWAWp o8Rg/Q2qx+ygqziME/122UyQpnvufdpZrg14fnx0Cohqpc3Hzg+6vgv1mZ5/NM7F fDVy5D5sfpWVNZ07ZuBQQvDaKHzMFifChco1OymsS9X5PyUbNv+0t+t7KQeVbc06 0zE2W+E3owrQA1OiRuJPoENvV/1mngm0q9XdOn1BHheVo8XOqcpB8hoC8B7VzUSa 2ZVKmSro/vwAsTh/sizkrLTDkZ+200tfXTUDdBW2u/nPX8K4zebSFRw0DPfIOnUU 09VWcJVrRve6AmbRG0U+ =JlFr -----END PGP SIGNATURE----- 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()
This commit is contained in:
commit
542d0e583b
2 changed files with 24 additions and 1 deletions
|
@ -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,
|
||||
};
|
||||
|
||||
/* -------------------------------------------------------------------------- */
|
||||
|
|
|
@ -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_ } }, \
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue