From 555fa9159353901861a18d70312ee35c55081989 Mon Sep 17 00:00:00 2001 From: Aaro Koskinen Date: Tue, 23 Feb 2016 00:22:56 +0200 Subject: [PATCH] MIPS: Octeon: Initialize system type string after device tree init. Initialize system type string after device tree init. Signed-off-by: Aaro Koskinen Cc: David Daney Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/12583/ Signed-off-by: Ralf Baechle --- arch/mips/cavium-octeon/setup.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/mips/cavium-octeon/setup.c b/arch/mips/cavium-octeon/setup.c index 4759494c3ff4..09a83cd6bfe8 100644 --- a/arch/mips/cavium-octeon/setup.c +++ b/arch/mips/cavium-octeon/setup.c @@ -464,7 +464,7 @@ static void octeon_halt(void) static char __read_mostly octeon_system_type[80]; -static int __init init_octeon_system_type(void) +static void __init init_octeon_system_type(void) { char const *board_type; @@ -474,10 +474,7 @@ static int __init init_octeon_system_type(void) snprintf(octeon_system_type, sizeof(octeon_system_type), "%s (%s)", board_type, octeon_model_get_string(read_c0_prid())); - - return 0; } -early_initcall(init_octeon_system_type); /** * Return a string representing the system type @@ -1141,6 +1138,7 @@ void __init device_tree_init(void) pr_info("Using internal Device Tree.\n"); } unflatten_and_copy_device_tree(); + init_octeon_system_type(); } static int __initdata disable_octeon_edac_p; -- 2.39.5