mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git
synced 2026-11-08 10:31:43 +01:00
software node: implement software_node_unregister()
Sometimes it is better to unregister individual nodes instead of trying
to do them all at once with software_node_unregister_nodes(), so create
software_node_unregister() so that you can unregister them one at a
time.
This is especially important when creating nodes in a hierarchy, with
parent -> children representations. Children always need to be removed
before a parent is, as the swnode logic assumes this is going to be the
case.
Fix up the lib/test_printf.c fwnode_pointer() test which to use this new
function as it had the problem of tearing things down in the backwards
order.
Fixes: f1ce39df50 ("lib/test_printf: Add tests for %pfw printk modifier")
Cc: stable <[email protected]>
Cc: Andy Shevchenko <[email protected]>
Cc: Brendan Higgins <[email protected]>
Cc: Dmitry Torokhov <[email protected]>
Cc: Petr Mladek <[email protected]>
Cc: Rafael J. Wysocki <[email protected]>
Cc: Rasmus Villemoes <[email protected]>
Cc: Sakari Ailus <[email protected]>
Cc: Sergey Senozhatsky <[email protected]>
Cc: Steven Rostedt <[email protected]>
Reported-by: Naresh Kamboju <[email protected]>
Reported-by: kernel test robot <[email protected]>
Reported-by: Randy Dunlap <[email protected]>
Tested-by: Petr Mladek <[email protected]>
Tested-by: Randy Dunlap <[email protected]>
Tested-by: Guenter Roeck <[email protected]>
Reviewed-by: Heikki Krogerus <[email protected]>
Acked-by: Randy Dunlap <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Greg Kroah-Hartman <[email protected]>
This commit is contained in:
1 parent
0e5596c54a
commit
46d26819a5
3 files changed
+25
-7
No files matched your search
+21
-6
@@ -712,17 +712,18 @@ EXPORT_SYMBOL_GPL(software_node_register_nodes);
|
||||
* @nodes: Zero terminated array of software nodes to be unregistered
|
||||
*
|
||||
* Unregister multiple software nodes at once.
|
||||
*
|
||||
* NOTE: Be careful using this call if the nodes had parent pointers set up in
|
||||
* them before registering. If so, it is wiser to remove the nodes
|
||||
* individually, in the correct order (child before parent) instead of relying
|
||||
* on the sequential order of the list of nodes in the array.
|
||||
*/
|
||||
void software_node_unregister_nodes(const struct software_node *nodes)
|
||||
{
|
||||
struct swnode *swnode;
|
||||
int i;
|
||||
|
||||
for (i = 0; nodes[i].name; i++) {
|
||||
swnode = software_node_to_swnode(&nodes[i]);
|
||||
if (swnode)
|
||||
fwnode_remove_software_node(&swnode->fwnode);
|
||||
}
|
||||
for (i = 0; nodes[i].name; i++)
|
||||
software_node_unregister(&nodes[i]);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(software_node_unregister_nodes);
|
||||
|
||||
@@ -741,6 +742,20 @@ int software_node_register(const struct software_node *node)
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(software_node_register);
|
||||
|
||||
/**
|
||||
* software_node_unregister - Unregister static software node
|
||||
* @node: The software node to be unregistered
|
||||
*/
|
||||
void software_node_unregister(const struct software_node *node)
|
||||
{
|
||||
struct swnode *swnode;
|
||||
|
||||
swnode = software_node_to_swnode(node);
|
||||
if (swnode)
|
||||
fwnode_remove_software_node(&swnode->fwnode);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(software_node_unregister);
|
||||
|
||||
struct fwnode_handle *
|
||||
fwnode_create_software_node(const struct property_entry *properties,
|
||||
const struct fwnode_handle *parent)
|
||||
|
||||
@@ -441,6 +441,7 @@ int software_node_register_nodes(const struct software_node *nodes);
|
||||
void software_node_unregister_nodes(const struct software_node *nodes);
|
||||
|
||||
int software_node_register(const struct software_node *node);
|
||||
void software_node_unregister(const struct software_node *node);
|
||||
|
||||
int software_node_notify(struct device *dev, unsigned long action);
|
||||
|
||||
|
||||
+3
-1
@@ -637,7 +637,9 @@ static void __init fwnode_pointer(void)
|
||||
test(second_name, "%pfwP", software_node_fwnode(&softnodes[1]));
|
||||
test(third_name, "%pfwP", software_node_fwnode(&softnodes[2]));
|
||||
|
||||
software_node_unregister_nodes(softnodes);
|
||||
software_node_unregister(&softnodes[2]);
|
||||
software_node_unregister(&softnodes[1]);
|
||||
software_node_unregister(&softnodes[0]);
|
||||
}
|
||||
|
||||
static void __init
|
||||
|
||||
Reference in new issue
Block a user