|
@@ -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));
|