Patchwork [25/25] Revert "dt: temporarily disable subtree creation failure check"

login
register
mail settings
Submitter Alexander Graf
Date May 30, 2012, 11 a.m.
Message ID <1338375646-15064-26-git-send-email-agraf@suse.de>
Download mbox | patch
Permalink /patch/161955/
State New
Headers show

Comments

Alexander Graf - May 30, 2012, 11 a.m.
This reverts commit 417d5f1051e73db3f0d185d3be3ff3e69174893d which
was meant as a temporary solution to keep external and dynamic
device tree construction intact.

Now that we switched to fully dynamic dt construction, it's no
longer necessary.

Signed-off-by: Alexander Graf <agraf@suse.de>
---
 device_tree.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
Andreas Färber - May 30, 2012, 2:44 p.m.
Am 30.05.2012 13:00, schrieb Alexander Graf:
> This reverts commit 417d5f1051e73db3f0d185d3be3ff3e69174893d which
> was meant as a temporary solution to keep external and dynamic
> device tree construction intact.
> 
> Now that we switched to fully dynamic dt construction, it's no
> longer necessary.
> 
> Signed-off-by: Alexander Graf <agraf@suse.de>

This commit message is going to break when the series gets rebased.

Andreas

Patch

diff --git a/device_tree.c b/device_tree.c
index b511b34..104f5d2 100644
--- a/device_tree.c
+++ b/device_tree.c
@@ -268,13 +268,11 @@  int qemu_devtree_add_subnode(void *fdt, const char *name)
     }
 
     retval = fdt_add_subnode(fdt, parent, basename);
-#if 0
     if (retval < 0) {
         fprintf(stderr, "FDT: Failed to create subnode %s: %s\n", name,
                 fdt_strerror(retval));
         exit(1);
     }
-#endif
 
     g_free(dupname);
     return retval;