Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1785538d authored by Tianjia Zhang's avatar Tianjia Zhang Committed by Greg Kroah-Hartman
Browse files

MIPS: Octeon: Fix build errors using clang 



[ Upstream commit 95339b70677dc6f9a2d669c4716058e71b8dc1c7 ]

A large number of the following errors is reported when compiling
with clang:

  cvmx-bootinfo.h:326:3: error: adding 'int' to a string does not append to the string [-Werror,-Wstring-plus-int]
                  ENUM_BRD_TYPE_CASE(CVMX_BOARD_TYPE_NULL)
                  ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  cvmx-bootinfo.h:321:20: note: expanded from macro 'ENUM_BRD_TYPE_CASE'
          case x: return(#x + 16);        /* Skip CVMX_BOARD_TYPE_ */
                         ~~~^~~~
  cvmx-bootinfo.h:326:3: note: use array indexing to silence this warning
  cvmx-bootinfo.h:321:20: note: expanded from macro 'ENUM_BRD_TYPE_CASE'
          case x: return(#x + 16);        /* Skip CVMX_BOARD_TYPE_ */
                          ^

Follow the prompts to use the address operator '&' to fix this error.

Signed-off-by: default avatarTianjia Zhang <tianjia.zhang@linux.alibaba.com>
Reviewed-by: default avatarNathan Chancellor <nathan@kernel.org>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent bb7d1de6

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -315,7 +315,7 @@ enum cvmx_chip_types_enum { 




/* Functions to return string based on type */

/* Functions to return string based on type */

#define ENUM_BRD_TYPE_CASE(x) \

#define ENUM_BRD_TYPE_CASE(x) \

	case x: return(#x + 16);	/* Skip CVMX_BOARD_TYPE_ */

	case x: return (&#x[16]);	/* Skip CVMX_BOARD_TYPE_ */

static inline const char *cvmx_board_type_to_string(enum

static inline const char *cvmx_board_type_to_string(enum

						    cvmx_board_types_enum type)

						    cvmx_board_types_enum type)

{

{
@@ -404,7 +404,7 @@ static inline const char *cvmx_board_type_to_string(enum 
}

}





#define ENUM_CHIP_TYPE_CASE(x) \

#define ENUM_CHIP_TYPE_CASE(x) \

	case x: return(#x + 15);	/* Skip CVMX_CHIP_TYPE */

	case x: return (&#x[15]);	/* Skip CVMX_CHIP_TYPE */

static inline const char *cvmx_chip_type_to_string(enum

static inline const char *cvmx_chip_type_to_string(enum

						   cvmx_chip_types_enum type)

						   cvmx_chip_types_enum type)

{

{