[PATCH v7 46/50] drivers/of: Rename unflatten_dt_node()

Gavin Shan
2015-11-04T13:13:32Z

This renames unflatten_dt_node() to unflatten_dt_nodes() as it
populates multiple device nodes from FDT blob. No logical changes
introduced.

Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
---
drivers/of/fdt.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index f4793d0..559ce49 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -380,7 +380,7 @@ static void reverse_nodes(struct device_node *parent)
}

/**
- * unflatten_dt_node - Alloc and populate a device_node from the flat tree
+ * unflatten_dt_nodes - Alloc and populate device nodes from the flat tree
* @blob: The parent device tree blob
* @mem: Memory chunk to use for allocating device nodes and properties
* @dad: Parent struct device_node
@@ -388,11 +388,11 @@ static void reverse_nodes(struct device_node *parent)
* @dryrun: If true, do not allocate device nodes but still calculate needed
* memory size
*/
-static void *unflatten_dt_node(const void *blob,
- void *mem,
- struct device_node *dad,
- struct device_node **nodepp,
- bool dryrun)
+static void *unflatten_dt_nodes(const void *blob,
+ void *mem,
+ struct device_node *dad,
+ struct device_node **nodepp,
+ bool dryrun)
{
struct device_node *root;
int offset = 0, depth = 0;
@@ -472,7 +472,7 @@ static void __unflatten_device_tree(const void *blob,
}

/* First pass, scan for size */
- size = (unsigned long)unflatten_dt_node(blob, NULL, NULL, NULL, true);
+ size = (unsigned long)unflatten_dt_nodes(blob, NULL, NULL, NULL, true);
size = ALIGN(size, 4);

pr_debug(" size is %lx, allocating...\n", size);
@@ -486,7 +486,7 @@ static void __unflatten_device_tree(const void *blob,
pr_debug(" unflattening %p...\n", mem);

/* Second pass, do actual unflattening */
- unflatten_dt_node(blob, mem, NULL, mynodes, false);
+ unflatten_dt_nodes(blob, mem, NULL, mynodes, false);
if (be32_to_cpup(mem + size) != 0xdeadbeef)
pr_warning("End of tree marker overwritten: %08x\n",
be32_to_cpup(mem + size));
--
2.1.0