linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] MIPS: Octeon: Fix build errors using clang
@ 2021-12-16  9:50 Tianjia Zhang
  2021-12-16 16:11 ` Nathan Chancellor
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Tianjia Zhang @ 2021-12-16  9:50 UTC (permalink / raw)
  To: Thomas Bogendoerfer, Nathan Chancellor, Nick Desaulniers,
	Adrian Schmutzler, linux-mips, linux-kernel
  Cc: Tianjia Zhang

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: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
---
 arch/mips/include/asm/octeon/cvmx-bootinfo.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/mips/include/asm/octeon/cvmx-bootinfo.h b/arch/mips/include/asm/octeon/cvmx-bootinfo.h
index 0e6bf220db61..6c61e0a63924 100644
--- a/arch/mips/include/asm/octeon/cvmx-bootinfo.h
+++ b/arch/mips/include/asm/octeon/cvmx-bootinfo.h
@@ -318,7 +318,7 @@ enum cvmx_chip_types_enum {
 
 /* Functions to return string based on type */
 #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
 						    cvmx_board_types_enum type)
 {
@@ -410,7 +410,7 @@ static inline const char *cvmx_board_type_to_string(enum
 }
 
 #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
 						   cvmx_chip_types_enum type)
 {
-- 
2.32.0


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH] MIPS: Octeon: Fix build errors using clang
  2021-12-16  9:50 [PATCH] MIPS: Octeon: Fix build errors using clang Tianjia Zhang
@ 2021-12-16 16:11 ` Nathan Chancellor
  2021-12-17 23:58 ` Philippe Mathieu-Daudé
  2021-12-21 13:57 ` Thomas Bogendoerfer
  2 siblings, 0 replies; 4+ messages in thread
From: Nathan Chancellor @ 2021-12-16 16:11 UTC (permalink / raw)
  To: Tianjia Zhang
  Cc: Thomas Bogendoerfer, Nick Desaulniers, Adrian Schmutzler,
	linux-mips, linux-kernel

On Thu, Dec 16, 2021 at 05:50:14PM +0800, Tianjia Zhang wrote:
> 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: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>

Reviewed-by: Nathan Chancellor <nathan@kernel.org>

> ---
>  arch/mips/include/asm/octeon/cvmx-bootinfo.h | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/mips/include/asm/octeon/cvmx-bootinfo.h b/arch/mips/include/asm/octeon/cvmx-bootinfo.h
> index 0e6bf220db61..6c61e0a63924 100644
> --- a/arch/mips/include/asm/octeon/cvmx-bootinfo.h
> +++ b/arch/mips/include/asm/octeon/cvmx-bootinfo.h
> @@ -318,7 +318,7 @@ enum cvmx_chip_types_enum {
>  
>  /* Functions to return string based on type */
>  #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
>  						    cvmx_board_types_enum type)
>  {
> @@ -410,7 +410,7 @@ static inline const char *cvmx_board_type_to_string(enum
>  }
>  
>  #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
>  						   cvmx_chip_types_enum type)
>  {
> -- 
> 2.32.0
> 

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] MIPS: Octeon: Fix build errors using clang
  2021-12-16  9:50 [PATCH] MIPS: Octeon: Fix build errors using clang Tianjia Zhang
  2021-12-16 16:11 ` Nathan Chancellor
@ 2021-12-17 23:58 ` Philippe Mathieu-Daudé
  2021-12-21 13:57 ` Thomas Bogendoerfer
  2 siblings, 0 replies; 4+ messages in thread
From: Philippe Mathieu-Daudé @ 2021-12-17 23:58 UTC (permalink / raw)
  To: Tianjia Zhang
  Cc: Thomas Bogendoerfer, Nathan Chancellor, Nick Desaulniers,
	Adrian Schmutzler, open list:BROADCOM NVRAM DRIVER, open list

On Thu, Dec 16, 2021 at 5:11 PM Tianjia Zhang
<tianjia.zhang@linux.alibaba.com> wrote:
>
> 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: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
> ---
>  arch/mips/include/asm/octeon/cvmx-bootinfo.h | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] MIPS: Octeon: Fix build errors using clang
  2021-12-16  9:50 [PATCH] MIPS: Octeon: Fix build errors using clang Tianjia Zhang
  2021-12-16 16:11 ` Nathan Chancellor
  2021-12-17 23:58 ` Philippe Mathieu-Daudé
@ 2021-12-21 13:57 ` Thomas Bogendoerfer
  2 siblings, 0 replies; 4+ messages in thread
From: Thomas Bogendoerfer @ 2021-12-21 13:57 UTC (permalink / raw)
  To: Tianjia Zhang
  Cc: Nathan Chancellor, Nick Desaulniers, Adrian Schmutzler,
	linux-mips, linux-kernel

On Thu, Dec 16, 2021 at 05:50:14PM +0800, Tianjia Zhang wrote:
> 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: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
> ---
>  arch/mips/include/asm/octeon/cvmx-bootinfo.h | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

applied to mips-next.

Thomas.

-- 
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a
good idea.                                                [ RFC1925, 2.3 ]

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2021-12-21 13:58 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-16  9:50 [PATCH] MIPS: Octeon: Fix build errors using clang Tianjia Zhang
2021-12-16 16:11 ` Nathan Chancellor
2021-12-17 23:58 ` Philippe Mathieu-Daudé
2021-12-21 13:57 ` Thomas Bogendoerfer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).