diff options
| author | Aaro Koskinen | 2016-02-23 00:22:55 +0200 |
|---|---|---|
| committer | Ralf Baechle | 2016-05-13 14:01:41 +0200 |
| commit | 6ecffafe242ec6d2789631499452c54177f0bb4c (patch) | |
| tree | 67036428f7a0cd62c9c8a0470dd3e58996f401a9 | |
| parent | 490f7548cfce36b63ec517a8ff7382287db86c29 (diff) | |
MIPS: Octeon: board_type_to_string: return NULL for unsupported board
Return NULL for unsupported board.
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/12581/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| -rw-r--r-- | arch/mips/cavium-octeon/setup.c | 9 | ||||
| -rw-r--r-- | arch/mips/include/asm/octeon/cvmx-bootinfo.h | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/arch/mips/cavium-octeon/setup.c b/arch/mips/cavium-octeon/setup.c index 8ffc1f108239..4759494c3ff4 100644 --- a/arch/mips/cavium-octeon/setup.c +++ b/arch/mips/cavium-octeon/setup.c @@ -466,9 +466,14 @@ static char __read_mostly octeon_system_type[80]; static int __init init_octeon_system_type(void) { + char const *board_type; + + board_type = cvmx_board_type_to_string(octeon_bootinfo->board_type); + if (board_type == NULL) + board_type = "Unsupported Board"; + snprintf(octeon_system_type, sizeof(octeon_system_type), "%s (%s)", - cvmx_board_type_to_string(octeon_bootinfo->board_type), - octeon_model_get_string(read_c0_prid())); + board_type, octeon_model_get_string(read_c0_prid())); return 0; } diff --git a/arch/mips/include/asm/octeon/cvmx-bootinfo.h b/arch/mips/include/asm/octeon/cvmx-bootinfo.h index c455d34f5a4f..62787765575e 100644 --- a/arch/mips/include/asm/octeon/cvmx-bootinfo.h +++ b/arch/mips/include/asm/octeon/cvmx-bootinfo.h @@ -400,7 +400,7 @@ static inline const char *cvmx_board_type_to_string(enum ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_KONTRON_S1901) ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_CUST_PRIVATE_MAX) } - return "Unsupported Board"; + return NULL; } #define ENUM_CHIP_TYPE_CASE(x) \ |