diff options
author | Aaro Koskinen <aaro.koskinen@nsn.com> | 2014-09-08 17:25:42 +0200 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2014-11-24 07:45:32 +0100 |
commit | 653e0528810280106b0ceb4c6988e6263ede852b (patch) | |
tree | 7692052f30d5ed2a4bf5658ec33bdeacd3a64605 /arch/mips/cavium-octeon/executive | |
parent | MIPS: Octeon: Delete potentially dangerous feature checks (diff) | |
download | linux-653e0528810280106b0ceb4c6988e6263ede852b.tar.xz linux-653e0528810280106b0ceb4c6988e6263ede852b.zip |
MIPS: Octeon: Move code to avoid forward declaration
Move code to avoid forward declarations.
Signed-off-by: Aaro Koskinen <aaro.koskinen@nsn.com>
Cc: David Daney <david.daney@cavium.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/7667/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/cavium-octeon/executive')
-rw-r--r-- | arch/mips/cavium-octeon/executive/octeon-model.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/arch/mips/cavium-octeon/executive/octeon-model.c b/arch/mips/cavium-octeon/executive/octeon-model.c index e1878723efd8..5105d0d57154 100644 --- a/arch/mips/cavium-octeon/executive/octeon-model.c +++ b/arch/mips/cavium-octeon/executive/octeon-model.c @@ -47,25 +47,6 @@ uint8_t cvmx_fuse_read_byte(int byte_addr) return read_cmd.s.dat; } -/** - * Given the chip processor ID from COP0, this function returns a - * string representing the chip model number. The string is of the - * form CNXXXXpX.X-FREQ-SUFFIX. - * - XXXX = The chip model number - * - X.X = Chip pass number - * - FREQ = Current frequency in Mhz - * - SUFFIX = NSP, EXP, SCP, SSP, or CP - * - * @chip_id: Chip ID - * - * Returns Model string - */ -const char *octeon_model_get_string(uint32_t chip_id) -{ - static char buffer[32]; - return octeon_model_get_string_buffer(chip_id, buffer); -} - /* * Version of octeon_model_get_string() that takes buffer as argument, * as running early in u-boot static/global variables don't work when @@ -427,3 +408,22 @@ const char *octeon_model_get_string_buffer(uint32_t chip_id, char *buffer) sprintf(buffer, "CN%s%sp%s-%d-%s", family, core_model, pass, clock_mhz, suffix); return buffer; } + +/** + * Given the chip processor ID from COP0, this function returns a + * string representing the chip model number. The string is of the + * form CNXXXXpX.X-FREQ-SUFFIX. + * - XXXX = The chip model number + * - X.X = Chip pass number + * - FREQ = Current frequency in Mhz + * - SUFFIX = NSP, EXP, SCP, SSP, or CP + * + * @chip_id: Chip ID + * + * Returns Model string + */ +const char *octeon_model_get_string(uint32_t chip_id) +{ + static char buffer[32]; + return octeon_model_get_string_buffer(chip_id, buffer); +} |