diff options
| author | Aaro Koskinen <aaro.koskinen@nsn.com> | 2014-09-08 17:25:43 +0200 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2014-11-24 07:45:32 +0100 |
| commit | da85e364952870db52625c4de7a4b5dfaf74d211 (patch) | |
| tree | d248e5887d5a1243d039666a7ab201aa89f95170 /arch/mips/include/asm/octeon | |
| parent | MIPS: Octeon: Move code to avoid forward declaration (diff) | |
| download | linux-da85e364952870db52625c4de7a4b5dfaf74d211.tar.xz linux-da85e364952870db52625c4de7a4b5dfaf74d211.zip | |
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>
Diffstat (limited to 'arch/mips/include/asm/octeon')
| -rw-r--r-- | arch/mips/include/asm/octeon/cvmx.h | 2 | ||||
| -rw-r--r-- | arch/mips/include/asm/octeon/octeon-model.h | 3 |
2 files changed, 1 insertions, 4 deletions
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. |