aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/of
diff options
context:
space:
mode:
authorGavin Shan <gwshan@linux.vnet.ibm.com>2016-05-03 23:22:49 +1000
committerRob Herring <robh@kernel.org>2016-05-16 07:22:34 -0500
commit947c82cbf01c9c6012cb96e385b5f6d6d1e1decb (patch)
treee38e850a6d0fe14905ef4fc1b58edc3d5714aed7 /drivers/of
parentdrivers/of: Avoid recursively calling unflatten_dt_node() (diff)
downloadlinux-dev-947c82cbf01c9c6012cb96e385b5f6d6d1e1decb.tar.xz
linux-dev-947c82cbf01c9c6012cb96e385b5f6d6d1e1decb.zip
drivers/of: Rename unflatten_dt_node()
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> Acked-by: Rob Herring <robh@kernel.org> Signed-off-by: Rob Herring <robh@kernel.org>
Diffstat (limited to 'drivers/of')
-rw-r--r--drivers/of/fdt.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index c2c4afcbb971..9c3e52d0d570 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -381,7 +381,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 a device_node 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
@@ -389,10 +389,10 @@ static void reverse_nodes(struct device_node *parent)
*
* It returns the size of unflattened device tree or error code
*/
-static int unflatten_dt_node(const void *blob,
- void *mem,
- struct device_node *dad,
- struct device_node **nodepp)
+static int unflatten_dt_nodes(const void *blob,
+ void *mem,
+ struct device_node *dad,
+ struct device_node **nodepp)
{
struct device_node *root;
int offset = 0, depth = 0;
@@ -479,7 +479,7 @@ static void __unflatten_device_tree(const void *blob,
}
/* First pass, scan for size */
- size = unflatten_dt_node(blob, NULL, NULL, NULL);
+ size = unflatten_dt_nodes(blob, NULL, NULL, NULL);
if (size < 0)
return;
@@ -495,7 +495,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);
+ unflatten_dt_nodes(blob, mem, NULL, mynodes);
if (be32_to_cpup(mem + size) != 0xdeadbeef)
pr_warning("End of tree marker overwritten: %08x\n",
be32_to_cpup(mem + size));