diff options
| author | Aaro Koskinen <aaro.koskinen@nsn.com> | 2014-09-08 19:25:43 +0400 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2014-11-24 09:45:32 +0300 |
| commit | da85e364952870db52625c4de7a4b5dfaf74d211 (patch) | |
| tree | d248e5887d5a1243d039666a7ab201aa89f95170 | |
| parent | 653e0528810280106b0ceb4c6988e6263ede852b (diff) | |
| download | linux-da85e364952870db52625c4de7a4b5dfaf74d211.tar.xz | |
MIPS: Octeon: Mark octeon_model_get_string() with __init
Mark octeon_model_get_string() with __init and make internal functions
static.
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/7668/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| -rw-r--r-- | arch/mips/cavium-octeon/executive/octeon-model.c | 7 | ||||
| -rw-r--r-- | arch/mips/include/asm/octeon/cvmx.h | 2 | ||||
| -rw-r--r-- | arch/mips/include/asm/octeon/octeon-model.h | 3 |
3 files changed, 5 insertions, 7 deletions
diff --git a/arch/mips/cavium-octeon/executive/octeon-model.c b/arch/mips/cavium-octeon/executive/octeon-model.c index 5105d0d57154..e15b049b3bd7 100644 --- a/arch/mips/cavium-octeon/executive/octeon-model.c +++ b/arch/mips/cavium-octeon/executive/octeon-model.c @@ -33,7 +33,7 @@ * * Returns fuse value: 0 or 1 */ -uint8_t cvmx_fuse_read_byte(int byte_addr) +static uint8_t __init cvmx_fuse_read_byte(int byte_addr) { union cvmx_mio_fus_rcmd read_cmd; @@ -52,7 +52,8 @@ uint8_t cvmx_fuse_read_byte(int byte_addr) * as running early in u-boot static/global variables don't work when * running from flash. */ -const char *octeon_model_get_string_buffer(uint32_t chip_id, char *buffer) +static const char *__init octeon_model_get_string_buffer(uint32_t chip_id, + char *buffer) { const char *family; const char *core_model; @@ -422,7 +423,7 @@ const char *octeon_model_get_string_buffer(uint32_t chip_id, char *buffer) * * Returns Model string */ -const char *octeon_model_get_string(uint32_t chip_id) +const char *__init octeon_model_get_string(uint32_t chip_id) { static char buffer[32]; return octeon_model_get_string_buffer(chip_id, buffer); diff --git a/arch/mips/include/asm/octeon/cvmx.h b/arch/mips/include/asm/octeon/cvmx.h index b0b544f96b70..33db1c806b01 100644 --- a/arch/mips/include/asm/octeon/cvmx.h +++ b/arch/mips/include/asm/octeon/cvmx.h @@ -451,6 +451,4 @@ static inline uint32_t cvmx_octeon_num_cores(void) return cvmx_pop(ciu_fuse); } -uint8_t cvmx_fuse_read_byte(int byte_addr); - #endif /* __CVMX_H__ */ diff --git a/arch/mips/include/asm/octeon/octeon-model.h b/arch/mips/include/asm/octeon/octeon-model.h index e2c122c6a657..e8a1c2fd52cd 100644 --- a/arch/mips/include/asm/octeon/octeon-model.h +++ b/arch/mips/include/asm/octeon/octeon-model.h @@ -326,8 +326,7 @@ static inline int __octeon_is_model_runtime__(uint32_t model) #define OCTEON_IS_COMMON_BINARY() 1 #undef OCTEON_MODEL -const char *octeon_model_get_string(uint32_t chip_id); -const char *octeon_model_get_string_buffer(uint32_t chip_id, char *buffer); +const char *__init octeon_model_get_string(uint32_t chip_id); /* * Return the octeon family, i.e., ProcessorID of the PrID register. |