diff options
| author | Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> | 2013-07-02 20:14:37 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-07-05 08:26:57 +0200 |
| commit | 3c84ded0f5ac0d48abc89215dcd84cb6406c3edb (patch) | |
| tree | c08cef37cd8d021a90f8701fbdbe19d64b48216f | |
| parent | ffa50c1e608df37d984f2d4df26625fdee53c06a (diff) | |
| download | barebox-3c84ded0f5ac0d48abc89215dcd84cb6406c3edb.tar.gz barebox-3c84ded0f5ac0d48abc89215dcd84cb6406c3edb.tar.xz | |
OF: remove device and resource pointer from struct device_node
struct device_node has its own resources and a pointer to associated
device_d. With recent platform related OF code, we can convert the
only user of it and remove those pointers from struct device_node.
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | drivers/of/base.c | 8 | ||||
| -rw-r--r-- | include/of.h | 3 |
2 files changed, 4 insertions, 7 deletions
diff --git a/drivers/of/base.c b/drivers/of/base.c index 9d631276f1..0244281e28 100644 --- a/drivers/of/base.c +++ b/drivers/of/base.c @@ -1594,6 +1594,7 @@ void of_free(struct device_node *node) { struct device_node *n, *nt; struct property *p, *pt; + struct device_d *dev; if (!node) return; @@ -1610,10 +1611,9 @@ void of_free(struct device_node *node) list_del(&node->list); } - if (node->device) - node->device->device_node = NULL; - else - free(node->resource); + dev = of_find_device_by_node(node); + if (dev) + dev->device_node = NULL; free(node->name); free(node->full_name); diff --git a/include/of.h b/include/of.h index f33ed20bbd..f01d8544d4 100644 --- a/include/of.h +++ b/include/of.h @@ -30,9 +30,6 @@ struct device_node { struct list_head children; struct list_head parent_list; struct list_head list; - struct resource *resource; - int num_resource; - struct device_d *device; struct list_head phandles; phandle phandle; }; |