redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

MIPS: Octeon: Mark octeon_model_get_string() with __init

Browse source 
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>
This commit is contained in:
Aaro Koskinen 2014-09-08 18:25:43 +03:00 committed by Ralf Baechle
parent 653e052881
commit da85e36495
3 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
arch/mips/cavium-octeon/executive/octeon-model.c
View file

@ -33,7 +33,7 @@
* *
* Returns fuse value: 0 or 1 * 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; 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 * as running early in u-boot static/global variables don't work when
* running from flash. * 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 *family;
const char *core_model; const char *core_model;
@ -422,7 +423,7 @@ const char *octeon_model_get_string_buffer(uint32_t chip_id, char *buffer)
* *
* Returns Model string * 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]; static char buffer[32];
return octeon_model_get_string_buffer(chip_id, buffer); return octeon_model_get_string_buffer(chip_id, buffer);

2
arch/mips/include/asm/octeon/cvmx.h
View file

@ -451,6 +451,4 @@ static inline uint32_t cvmx_octeon_num_cores(void)
return cvmx_pop(ciu_fuse); return cvmx_pop(ciu_fuse);
} }
uint8_t cvmx_fuse_read_byte(int byte_addr);
#endif /* __CVMX_H__ */ #endif /* __CVMX_H__ */

3
arch/mips/include/asm/octeon/octeon-model.h
View file

@ -326,8 +326,7 @@ static inline int __octeon_is_model_runtime__(uint32_t model)
#define OCTEON_IS_COMMON_BINARY() 1 #define OCTEON_IS_COMMON_BINARY() 1
#undef OCTEON_MODEL #undef OCTEON_MODEL
const char *octeon_model_get_string(uint32_t chip_id); const char *__init octeon_model_get_string(uint32_t chip_id);
const char *octeon_model_get_string_buffer(uint32_t chip_id, char *buffer);
/* /*
* Return the octeon family, i.e., ProcessorID of the PrID register. * Return the octeon family, i.e., ProcessorID of the PrID register.