iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Device properties framework fixes for 5.12-rc3.

Browse Source 
Prevent software nodes from being registered before their parents and
 fix a recent mistake causing already registered software nodes to be
 registered again in some cases (Heikki Krogerus).
 -----BEGIN PGP SIGNATURE-----
 
 iQJGBAABCAAwFiEE4fcc61cGeeHD/fCwgsRv/nhiVHEFAmBLrzUSHHJqd0Byand5
 c29ja2kubmV0AAoJEILEb/54YlRxIYwP/ic63rh2Fppapauy7Nmp/j1nlkGr7hdG
 0n1GqXHydkVZsBe/zDI6GB6HpuhJCxkgoJ1Z8cexjudqfgNxmP47uCh6Lai2/Yyr
 gf5d3n5dvnJBeWcZkCBvijt3cg4E8hRpRtysL6vLXRBXARrQCYJCJpIqbiem2H9r
 JyCgzmvyqOZADDU+EhlQrlNKyr3y6YWvq9eTtSR4+IHqwNbB59QODj4a/GTuVa7h
 8Prlu+gIzKoQE7UQuAxSOBC+ERqyBevMXVWrHZFP1H85CruXbg7GGyogk4o2RGpe
 Hd9iuO6A5QonOSJows9+uU6NVQcOLZUVx18aoKC+pNO9ajk4QpWpBE/RT0xdeWcR
 7Qw0Qbo7f+nPF7BS6TXLwM1wf9iKXe3XNz+nbKvMnMEJECzVRTBMWiAsN18vQUta
 qJhF4rSX+HSNmjgbe7XF102cFjqxtEyVXvpVixg/+m4SX6i63vxFrLXE1eJKvRng
 vjb47omLPweqISD6JH9NtN2aaYfVQju381eLU+Hj37rFXphs+xGXtHRS6SzIUmSl
 hshhH8e8hegGib8kDR5ELeYVid+ZFHkW5owWx0ZEIWoL8WPM2i/lUO64nh+VWGRe
 VObWgUmW7N5dyv3DYD0lF/qLI3iao1Ih2ZFOcj/lBdi5VteyUrZKK2P6U678pxjm
 3/Yl+gUGdBcp
 =02Kr
 -----END PGP SIGNATURE-----

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

Pull device properties framework fixes from Rafael Wysocki:
 "Prevent software nodes from being registered before their parents and
  fix a recent mistake causing already registered software nodes to be
  registered again in some cases (Heikki Krogerus)"

* tag 'devprop-5.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  software node: Fix device_add_software_node()
  software node: Fix node registration
This commit is contained in:
Linus Torvalds 2021-03-12 13:09:29 -08:00
commit 261410082d
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
drivers/base/swnode.c
View File

@ -938,6 +938,9 @@ int software_node_register(const struct software_node *node)
if (software_node_to_swnode(node))
return -EEXIST;
if (node->parent && !parent)
return -EINVAL;
return PTR_ERR_OR_ZERO(swnode_register(node, parent, 0));
}
EXPORT_SYMBOL_GPL(software_node_register);
@ -1002,25 +1005,33 @@ EXPORT_SYMBOL_GPL(fwnode_remove_software_node);
/**
* device_add_software_node - Assign software node to a device
* @dev: The device the software node is meant for.
* @swnode: The software node.
* @node: The software node.
*
* This function will register @swnode and make it the secondary firmware node
* pointer of @dev. If @dev has no primary node, then @swnode will become the primary
* node.
* This function will make @node the secondary firmware node pointer of @dev. If
* @dev has no primary node, then @node will become the primary node. The
* function will register @node automatically if it wasn't already registered.
*/
int device_add_software_node(struct device *dev, const struct software_node *swnode)
int device_add_software_node(struct device *dev, const struct software_node *node)
{
struct swnode *swnode;
int ret;
/* Only one software node per device. */
if (dev_to_swnode(dev))
return -EBUSY;
ret = software_node_register(swnode);
if (ret)
return ret;
swnode = software_node_to_swnode(node);
if (swnode) {
kobject_get(&swnode->kobj);
} else {
ret = software_node_register(node);
if (ret)
return ret;
set_secondary_fwnode(dev, software_node_fwnode(swnode));
swnode = software_node_to_swnode(node);
}
set_secondary_fwnode(dev, &swnode->fwnode);
return 0;
}

2
include/linux/property.h
View File

@ -488,7 +488,7 @@ fwnode_create_software_node(const struct property_entry *properties,
const struct fwnode_handle *parent);
void fwnode_remove_software_node(struct fwnode_handle *fwnode);
int device_add_software_node(struct device *dev, const struct software_node *swnode);
int device_add_software_node(struct device *dev, const struct software_node *node);
void device_remove_software_node(struct device *dev);
int device_create_managed_software_node(struct device *dev,