arc: use unflatten_and_copy_device_tree

Use the common unflatten_and_copy_device_tree to copy the built-in FDT
out of init section.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Acked-by: Vineet Gupta <vgupta@synopsys.com>
Acked-by: Grant Likely <grant.likely@linaro.org>

2 files changed, 1 insertions, 17 deletions

diff --git a/arch/arc/kernel/devtree.c b/arch/arc/kernel/devtree.c
index 2340af0e1d6f..eeb613aa44ff 100644
--- a/arch/arc/kernel/devtree.c
+++ b/arch/arc/kernel/devtree.c
@@ -100,18 +100,3 @@ struct machine_desc * __init setup_machine_fdt(void *dt)
 
         return mdesc_best;
 }
-
-/*
- * Copy the flattened DT out of .init since unflattening doesn't copy strings
- * and the normal DT APIs refs them from orig flat DT
- */
-void __init copy_devtree(void)
-{
-        void *alloc = early_init_dt_alloc_memory_arch(
-                        be32_to_cpu(initial_boot_params->totalsize), 64);
-        if (alloc) {
-                memcpy(alloc, initial_boot_params,
-                                be32_to_cpu(initial_boot_params->totalsize));
-                initial_boot_params = alloc;
-        }
-}
diff --git a/arch/arc/kernel/setup.c b/arch/arc/kernel/setup.c
index 2c68bc7e6a78..710bf895dc2c 100644
--- a/arch/arc/kernel/setup.c
+++ b/arch/arc/kernel/setup.c
@@ -346,8 +346,7 @@ void __init setup_arch(char **cmdline_p)
         setup_arch_memory();
 
         /* copy flat DT out of .init and then unflatten it */
-        copy_devtree();
-        unflatten_device_tree();
+        unflatten_and_copy_device_tree();
 
         /* Can be issue if someone passes cmd line arg "ro"
          * But that is unlikely so keeping it as it is