From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Tue, 12 Nov 2013 19:42:23 +0000 (+0100)
Subject: openrisc: Refactor or32_early_setup()
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=621c2cd853fca98258b720d9fe7e8c031ec7f96f;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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>
---

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)