Date:   Thu, 16 Dec 2021 09:11:33 -0700
From:   Nathan Chancellor <nathan@kernel.org>
To:     Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
Cc:     Thomas Bogendoerfer <tsbogend@alpha.franken.de>,
        Nick Desaulniers <ndesaulniers@google.com>,
        Adrian Schmutzler <freifunk@adrianschmutzler.de>,
        linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] MIPS: Octeon: Fix build errors using clang
Message-ID: <YbtlNT7WUi3b8Dqh@archlinux-ax161>
References: <20211216095014.11918-1-tianjia.zhang@linux.alibaba.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20211216095014.11918-1-tianjia.zhang@linux.alibaba.com>
Precedence: bulk

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
>