diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2013-11-12 20:42:23 +0100 |
|---|---|---|
| committer | Jonas Bonn <jonas@southpole.se> | 2013-11-15 11:03:51 +0100 |
| commit | 621c2cd853fca98258b720d9fe7e8c031ec7f96f (patch) | |
| tree | bf499fda61078e61a38cca93415c7b3a68d05e88 /arch/openrisc | |
| parent | 0db041be3be9c84c2949a4f7eb9c3b6cd80ae97c (diff) | |
| download | linux-stable-621c2cd853fca98258b720d9fe7e8c031ec7f96f.tar.gz linux-stable-621c2cd853fca98258b720d9fe7e8c031ec7f96f.tar.bz2 linux-stable-621c2cd853fca98258b720d9fe7e8c031ec7f96f.zip | |
openrisc: Refactor or32_early_setup()
- Change fdt pointer (passed from head.S) from unsigned int to void *,
which allows to kill a cast, and makes it compatible with __dtb_start.
- Use pr_info(),
- Extract common part.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: linux@lists.openrisc.net
Signed-off-by: Jonas Bonn <jonas@southpole.se>
Diffstat (limited to 'arch/openrisc')
| -rw-r--r-- | arch/openrisc/kernel/setup.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/openrisc/kernel/setup.c b/arch/openrisc/kernel/setup.c index 89c497813bab..7d205be45913 100644 --- a/arch/openrisc/kernel/setup.c +++ b/arch/openrisc/kernel/setup.c @@ -210,15 +210,15 @@ void __init setup_cpuinfo(void) * Falls back on built-in device tree in case null pointer is passed. */ -void __init or32_early_setup(unsigned int fdt) +void __init or32_early_setup(void *fdt) { - if (fdt) { - early_init_devtree((void*) fdt); - printk(KERN_INFO "FDT at 0x%08x\n", fdt); - } else { - early_init_devtree(__dtb_start); - printk(KERN_INFO "Compiled-in FDT at %p\n", __dtb_start); + if (fdt) + pr_info("FDT at %p\n", fdt); + else { + fdt = __dtb_start; + pr_info("Compiled-in FDT at %p\n", fdt); } + early_init_devtree(fdt); } static int __init openrisc_device_probe(void) |