summaryrefslogtreecommitdiffstats
path: root/arch/mips/kernel/prom.c
diff options
context:
space:
mode:
authorRob Herring <rob.herring@calxeda.com>2013-08-28 09:56:40 -0500
committerRob Herring <rob.herring@calxeda.com>2013-10-09 20:03:57 -0500
commit97e7f455434704b4d42f918ac3de76f593e642c1 (patch)
tree05b894bd33af022f00a1cf5b569850dba02439f3 /arch/mips/kernel/prom.c
parent986c494b3c05bac5eace21f8e3a42f2afbfcbd34 (diff)
downloadlinux-97e7f455434704b4d42f918ac3de76f593e642c1.tar.bz2
mips: use common of_flat_dt_get_machine_name
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>
Diffstat (limited to 'arch/mips/kernel/prom.c')
-rw-r--r--arch/mips/kernel/prom.c15
1 files changed, 1 insertions, 14 deletions
diff --git a/arch/mips/kernel/prom.c b/arch/mips/kernel/prom.c
index 0b2485f9a6c1..3c3b0df8f48d 100644
--- a/arch/mips/kernel/prom.c
+++ b/arch/mips/kernel/prom.c
@@ -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