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@xxxxxxxxx> --- Changelog: v3: - remove gpio related changes as there is now a separate patch Cc: barebox@xxxxxxxxxxxxxxxxxxx --- drivers/of/base.c | 8 ++++---- include/of.h | 3 --- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/of/base.c b/drivers/of/base.c index 9d63127..0244281 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 f33ed20..f01d854 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; }; -- 1.7.2.5 _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox