Commit da85e364 authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Ralf Baechle
Browse files

MIPS: Octeon: Mark octeon_model_get_string() with __init 



Mark octeon_model_get_string() with __init and make internal functions
static.

Signed-off-by: default avatarAaro 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: default avatarRalf Baechle <ralf@linux-mips.org>
parent 653e0528

arch/mips/cavium-octeon/executive/octeon-model.c

+4 −3
Original line number Diff line number Diff line
@@ -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);

arch/mips/include/asm/octeon/cvmx.h

+0 −2
Original line number Diff line number Diff line
@@ -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__  */

arch/mips/include/asm/octeon/octeon-model.h

+1 −2
Original line number Diff line number Diff line
@@ -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.

CRA Git | Maintained and supported by SUSTech CRA and CCSE