diff options
| author | Aaro Koskinen | 2016-02-22 23:22:56 +0100 |
|---|---|---|
| committer | Ralf Baechle | 2016-05-13 14:01:42 +0200 |
| commit | 8f2068bc9e875540b5fb372294095833651ea1e2 (patch) | |
| tree | 7e5131c9086722d8d538900d8bc18157f04859b1 | |
| parent | MIPS: Octeon: board_type_to_string: return NULL for unsupported board (diff) | |
| download | kernel-qcow2-linux-8f2068bc9e875540b5fb372294095833651ea1e2.tar.gz kernel-qcow2-linux-8f2068bc9e875540b5fb372294095833651ea1e2.tar.xz kernel-qcow2-linux-8f2068bc9e875540b5fb372294095833651ea1e2.zip | |
MIPS: Octeon: Initialize system type string after device tree init.
Initialize system type string after device tree init.
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Cc: David Daney <ddaney.cavm@gmail.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/12583/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| -rw-r--r-- | arch/mips/cavium-octeon/setup.c | 6 |
1 files 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; |