From 9a12acf1e3fb6cfd6854b5c1fac63b5cac671be8 Mon Sep 17 00:00:00 2001 From: Maximilian Brune Date: Fri, 14 Jun 2024 17:54:40 +0200 Subject: include/device_tree.h: Fix function name fdt_node_name Rename fdt_node_name to the actual function name and also rename the references. Signed-off-by: Maximilian Brune Change-Id: I527146df26264a0c3af1ad01c21644d751b80236 Reviewed-on: https://review.coreboot.org/c/coreboot/+/83084 Reviewed-by: Yu-Ping Wu Tested-by: build bot (Jenkins) Reviewed-by: Eric Lai --- src/commonlib/include/commonlib/device_tree.h | 12 +++++------- src/lib/fit.c | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/commonlib/include/commonlib/device_tree.h b/src/commonlib/include/commonlib/device_tree.h index be7335783f..81377fa9df 100644 --- a/src/commonlib/include/commonlib/device_tree.h +++ b/src/commonlib/include/commonlib/device_tree.h @@ -103,8 +103,11 @@ bool fdt_is_valid(const void *blob); /* Read the property at offset, if any exists. */ int fdt_next_property(const void *blob, uint32_t offset, struct fdt_property *prop); -/* Read the name of the node at offset, if any exists. */ -int fdt_node_name(const void *blob, uint32_t offset, const char **name); +/* + * Read the node name into 'name' of the node behind 'node_offset' + * and return total bytes used for name + */ +int fdt_next_node_name(const void *blob, uint32_t node_offset, const char **name); void fdt_print_node(const void *blob, uint32_t offset); int fdt_skip_node(const void *blob, uint32_t offset); @@ -123,11 +126,6 @@ size_t fdt_find_subnodes_by_prefix(const void *blob, u32 node_offset, const char /* Find a node by a given alias and return its offset */ u32 fdt_find_node_by_alias(const void *blob, const char *alias_name, u32 *addr_cells, u32 *size_cells); -/* - * Read the node name into 'name' of the node behind 'node_offset' - * and return total bytes used for name - */ -int fdt_next_node_name(const void *blob, uint32_t node_offset, const char **name); /* Read memory regions from a flat device-tree. */ size_t fdt_read_memory_regions(const void *blob, struct device_tree_region regions[], diff --git a/src/lib/fit.c b/src/lib/fit.c index 7f0fe6773a..3bfca57aab 100644 --- a/src/lib/fit.c +++ b/src/lib/fit.c @@ -178,7 +178,7 @@ static int fdt_find_compat(const void *blob, uint32_t start_offset, int offset = start_offset; int size; - size = fdt_node_name(blob, offset, NULL); + size = fdt_next_node_name(blob, offset, NULL); if (!size) return -1; offset += size; -- cgit v1.2.3