OF: base: rename of_free to of_delete_node
of_free is misleading about the actual purpose of the function. There is already a of_create_node counterpart, so rename of_free to of_create_node and update all users accordingly. Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
parent
b73f70bb1a
commit
cf31688b6a
|
@ -87,7 +87,7 @@ static int do_of_node(int argc, char *argv[])
|
||||||
return -ENOENT;
|
return -ENOENT;
|
||||||
}
|
}
|
||||||
|
|
||||||
of_free(node);
|
of_delete_node(node);
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -86,7 +86,7 @@ static int do_oftree(int argc, char *argv[])
|
||||||
struct device_node *root = of_get_root_node();
|
struct device_node *root = of_get_root_node();
|
||||||
|
|
||||||
if (root)
|
if (root)
|
||||||
of_free(root);
|
of_delete_node(root);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -162,7 +162,7 @@ static int do_oftree(int argc, char *argv[])
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
of_print_nodes(root, 0);
|
of_print_nodes(root, 0);
|
||||||
of_free(root);
|
of_delete_node(root);
|
||||||
} else {
|
} else {
|
||||||
struct device_node *n = of_find_node_by_path(node);
|
struct device_node *n = of_find_node_by_path(node);
|
||||||
if (!n) {
|
if (!n) {
|
||||||
|
|
|
@ -1549,39 +1549,6 @@ int of_add_memory(struct device_node *node, bool dump)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
void of_free(struct device_node *node)
|
|
||||||
{
|
|
||||||
struct device_node *n, *nt;
|
|
||||||
struct property *p, *pt;
|
|
||||||
struct device_d *dev;
|
|
||||||
|
|
||||||
if (!node)
|
|
||||||
return;
|
|
||||||
|
|
||||||
list_for_each_entry_safe(p, pt, &node->properties, list)
|
|
||||||
of_delete_property(p);
|
|
||||||
|
|
||||||
list_for_each_entry_safe(n, nt, &node->children, parent_list) {
|
|
||||||
of_free(n);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (node->parent) {
|
|
||||||
list_del(&node->parent_list);
|
|
||||||
list_del(&node->list);
|
|
||||||
}
|
|
||||||
|
|
||||||
dev = of_find_device_by_node(node);
|
|
||||||
if (dev)
|
|
||||||
dev->device_node = NULL;
|
|
||||||
|
|
||||||
free(node->name);
|
|
||||||
free(node->full_name);
|
|
||||||
free(node);
|
|
||||||
|
|
||||||
if (node == root_node)
|
|
||||||
of_set_root_node(NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void __of_parse_phandles(struct device_node *node)
|
static void __of_parse_phandles(struct device_node *node)
|
||||||
{
|
{
|
||||||
struct device_node *n;
|
struct device_node *n;
|
||||||
|
@ -1679,6 +1646,38 @@ out:
|
||||||
return dn;
|
return dn;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void of_delete_node(struct device_node *node)
|
||||||
|
{
|
||||||
|
struct device_node *n, *nt;
|
||||||
|
struct property *p, *pt;
|
||||||
|
struct device_d *dev;
|
||||||
|
|
||||||
|
if (!node)
|
||||||
|
return;
|
||||||
|
|
||||||
|
list_for_each_entry_safe(p, pt, &node->properties, list)
|
||||||
|
of_delete_property(p);
|
||||||
|
|
||||||
|
list_for_each_entry_safe(n, nt, &node->children, parent_list)
|
||||||
|
of_delete_node(n);
|
||||||
|
|
||||||
|
if (node->parent) {
|
||||||
|
list_del(&node->parent_list);
|
||||||
|
list_del(&node->list);
|
||||||
|
}
|
||||||
|
|
||||||
|
dev = of_find_device_by_node(node);
|
||||||
|
if (dev)
|
||||||
|
dev->device_node = NULL;
|
||||||
|
|
||||||
|
free(node->name);
|
||||||
|
free(node->full_name);
|
||||||
|
free(node);
|
||||||
|
|
||||||
|
if (node == root_node)
|
||||||
|
of_set_root_node(NULL);
|
||||||
|
}
|
||||||
|
|
||||||
int of_device_is_stdout_path(struct device_d *dev)
|
int of_device_is_stdout_path(struct device_d *dev)
|
||||||
{
|
{
|
||||||
struct device_node *dn;
|
struct device_node *dn;
|
||||||
|
|
|
@ -211,7 +211,7 @@ struct device_node *of_unflatten_dtb(struct device_node *root, void *infdt)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
err:
|
err:
|
||||||
of_free(root);
|
of_delete_node(root);
|
||||||
|
|
||||||
return ERR_PTR(ret);
|
return ERR_PTR(ret);
|
||||||
}
|
}
|
||||||
|
|
|
@ -139,7 +139,7 @@ extern struct device_node *of_new_node(struct device_node *parent,
|
||||||
const char *name);
|
const char *name);
|
||||||
extern struct device_node *of_create_node(struct device_node *root,
|
extern struct device_node *of_create_node(struct device_node *root,
|
||||||
const char *path);
|
const char *path);
|
||||||
extern void of_free(struct device_node *node);
|
extern void of_delete_node(struct device_node *node);
|
||||||
|
|
||||||
extern int of_machine_is_compatible(const char *compat);
|
extern int of_machine_is_compatible(const char *compat);
|
||||||
extern int of_device_is_compatible(const struct device_node *device,
|
extern int of_device_is_compatible(const struct device_node *device,
|
||||||
|
@ -508,7 +508,7 @@ static inline struct device_node *of_create_node(struct device_node *root,
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void of_free(struct device_node *node)
|
static inline void of_delete_node(struct device_node *node)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue