diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-09-11 19:16:30 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-09-11 19:16:30 +0200 |
commit | ce4c8f882041341cbb3f1b4632b20440692cbccc (patch) | |
tree | 02c53ebe5496d7f6461d43dafce68d31ea63502b /lib | |
parent | Merge tag 'devicetree-fixes-for-5.15-1' of git://git.kernel.org/pub/scm/linux... (diff) | |
parent | bootconfig: Rename xbc_node_find_child() to xbc_node_find_subkey() (diff) | |
download | linux-ce4c8f882041341cbb3f1b4632b20440692cbccc.tar.xz linux-ce4c8f882041341cbb3f1b4632b20440692cbccc.zip |
Merge tag 'trace-v5.15-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Pull tracing fixes from Steven Rostedt:
"Minor fixes to the processing of the bootconfig tree"
* tag 'trace-v5.15-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
bootconfig: Rename xbc_node_find_child() to xbc_node_find_subkey()
tracing/boot: Fix to check the histogram control param is a leaf node
tracing/boot: Fix trace_boot_hist_add_array() to check array is value
Diffstat (limited to 'lib')
-rw-r--r-- | lib/bootconfig.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/bootconfig.c b/lib/bootconfig.c index 927017431fb6..f8419cff1147 100644 --- a/lib/bootconfig.c +++ b/lib/bootconfig.c @@ -142,16 +142,16 @@ xbc_node_match_prefix(struct xbc_node *node, const char **prefix) } /** - * xbc_node_find_child() - Find a child node which matches given key + * xbc_node_find_subkey() - Find a subkey node which matches given key * @parent: An XBC node. * @key: A key string. * - * Search a node under @parent which matches @key. The @key can contain + * Search a key node under @parent which matches @key. The @key can contain * several words jointed with '.'. If @parent is NULL, this searches the * node from whole tree. Return NULL if no node is matched. */ struct xbc_node * __init -xbc_node_find_child(struct xbc_node *parent, const char *key) +xbc_node_find_subkey(struct xbc_node *parent, const char *key) { struct xbc_node *node; @@ -191,7 +191,7 @@ const char * __init xbc_node_find_value(struct xbc_node *parent, const char *key, struct xbc_node **vnode) { - struct xbc_node *node = xbc_node_find_child(parent, key); + struct xbc_node *node = xbc_node_find_subkey(parent, key); if (!node || !xbc_node_is_key(node)) return NULL; |