mips: use common of_flat_dt_get_machine_name
authorRob Herring <rob.herring@calxeda.com>
Wed, 28 Aug 2013 14:56:40 +0000 (09:56 -0500)
committerRob Herring <rob.herring@calxeda.com>
Thu, 10 Oct 2013 01:03:57 +0000 (20:03 -0500)
Convert mips to use the common of_flat_dt_get_machine_name function.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Acked-by: John Crispin <blogic@openwrt.org>
arch/mips/kernel/prom.c

index 0b2485f9a6c12bf709f50e783ffb856103e66309..3c3b0df8f48d8916c184ffdb6d4c01e0a48aa666 100644 (file)
@@ -47,24 +47,11 @@ void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align)
        return __alloc_bootmem(size, align, __pa(MAX_DMA_ADDRESS));
 }
 
-int __init early_init_dt_scan_model(unsigned long node,        const char *uname,
-                                   int depth, void *data)
-{
-       if (!depth) {
-               char *model = of_get_flat_dt_prop(node, "model", NULL);
-
-               if (model)
-                       mips_set_machine_name(model);
-       }
-       return 0;
-}
-
 void __init __dt_setup_arch(struct boot_param_header *bph)
 {
        if (!early_init_dt_scan(bph))
                return;
 
-       /* try to load the mips machine name */
-       of_scan_flat_dt(early_init_dt_scan_model, NULL);
+       mips_set_machine_name(of_flat_dt_get_machine_name());
 }
 #endif