summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2021-09-11 19:16:30 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2021-09-11 19:16:30 +0200
commitce4c8f882041341cbb3f1b4632b20440692cbccc (patch)
tree02c53ebe5496d7f6461d43dafce68d31ea63502b /include
parentMerge tag 'devicetree-fixes-for-5.15-1' of git://git.kernel.org/pub/scm/linux... (diff)
parentbootconfig: Rename xbc_node_find_child() to xbc_node_find_subkey() (diff)
downloadlinux-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 'include')
-rw-r--r--include/linux/bootconfig.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/bootconfig.h b/include/linux/bootconfig.h
index abe089c27529..537e1b991f11 100644
--- a/include/linux/bootconfig.h
+++ b/include/linux/bootconfig.h
@@ -110,7 +110,7 @@ static inline __init bool xbc_node_is_leaf(struct xbc_node *node)
}
/* Tree-based key-value access APIs */
-struct xbc_node * __init xbc_node_find_child(struct xbc_node *parent,
+struct xbc_node * __init xbc_node_find_subkey(struct xbc_node *parent,
const char *key);
const char * __init xbc_node_find_value(struct xbc_node *parent,
@@ -148,7 +148,7 @@ xbc_find_value(const char *key, struct xbc_node **vnode)
*/
static inline struct xbc_node * __init xbc_find_node(const char *key)
{
- return xbc_node_find_child(NULL, key);
+ return xbc_node_find_subkey(NULL, key);
}
/**