Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <e818c889-40f8-0318-e29d-372da57c33d8@redhat.com>
Date:   Wed, 9 Aug 2023 21:59:27 +0200
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.13.0
Subject: Re: [PATCH] platform/x86: msi-ec: Fix the build
Content-Language: en-US, nl
To:     Jean Delvare <jdelvare@suse.de>,
        platform-driver-x86@vger.kernel.org
Cc:     LKML <linux-kernel@vger.kernel.org>,
        Mark Gross <markgross@kernel.org>,
        Nikita Kravets <teackot@gmail.com>
References: <20230805101010.54d49e91@endymion.delvare>
From:   Hans de Goede <hdegoede@redhat.com>
In-Reply-To: <20230805101010.54d49e91@endymion.delvare>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Precedence: bulk

Hi,

On 8/5/23 10:10, Jean Delvare wrote:
> The msi-ec driver fails to build for me (gcc 7.5):
> 
>   CC [M]  drivers/platform/x86/msi-ec.o
> drivers/platform/x86/msi-ec.c:72:6: error: initializer element is not constant
>     { SM_ECO_NAME,     0xc2 },
>       ^~~~~~~~~~~
> drivers/platform/x86/msi-ec.c:72:6: note: (near initialization for ‘CONF0.shift_mode.modes[0].name’)
> drivers/platform/x86/msi-ec.c:73:6: error: initializer element is not constant
>     { SM_COMFORT_NAME, 0xc1 },
>       ^~~~~~~~~~~~~~~
> drivers/platform/x86/msi-ec.c:73:6: note: (near initialization for ‘CONF0.shift_mode.modes[1].name’)
> drivers/platform/x86/msi-ec.c:74:6: error: initializer element is not constant
>     { SM_SPORT_NAME,   0xc0 },
>       ^~~~~~~~~~~~~
> drivers/platform/x86/msi-ec.c:74:6: note: (near initialization for ‘CONF0.shift_mode.modes[2].name’)
> (...)
> 
> Don't try to be smart, just use defines for the constant strings. The
> compiler will recognize it's the same string and will store it only
> once in the data section anyway.
> 
> Signed-off-by: Jean Delvare <jdelvare@suse.de>
> Fixes: 392cacf2aa10 ("platform/x86: Add new msi-ec driver")
> Cc: stable@vger.kernel.org
> Cc: Nikita Kravets <teackot@gmail.com>
> Cc: Hans de Goede <hdegoede@redhat.com>
> Cc: Mark Gross <markgross@kernel.org>

Thank you for your patch, I've applied this patch to my fixes
branch:
https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/log/?h=fixes

I will include this patch in my next fixes pull-req to Linus
for the current kernel development cycle.

Regards,

Hans


> ---
>  drivers/platform/x86/msi-ec.c |   16 ++++++++--------
>  1 file changed, 8 insertions(+), 8 deletions(-)
> 
> --- linux-6.4.orig/drivers/platform/x86/msi-ec.c
> +++ linux-6.4/drivers/platform/x86/msi-ec.c
> @@ -27,15 +27,15 @@
>  #include <linux/seq_file.h>
>  #include <linux/string.h>
>  
> -static const char *const SM_ECO_NAME       = "eco";
> -static const char *const SM_COMFORT_NAME   = "comfort";
> -static const char *const SM_SPORT_NAME     = "sport";
> -static const char *const SM_TURBO_NAME     = "turbo";
> +#define SM_ECO_NAME		"eco"
> +#define SM_COMFORT_NAME		"comfort"
> +#define SM_SPORT_NAME		"sport"
> +#define SM_TURBO_NAME		"turbo"
>  
> -static const char *const FM_AUTO_NAME     = "auto";
> -static const char *const FM_SILENT_NAME   = "silent";
> -static const char *const FM_BASIC_NAME    = "basic";
> -static const char *const FM_ADVANCED_NAME = "advanced";
> +#define FM_AUTO_NAME		"auto"
> +#define FM_SILENT_NAME		"silent"
> +#define FM_BASIC_NAME		"basic"
> +#define FM_ADVANCED_NAME	"advanced"
>  
>  static const char * const ALLOWED_FW_0[] __initconst = {
>  	"14C1EMS1.012",
> 
>