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;
Date:   Sat, 5 Aug 2023 10:10:10 +0200
From:   Jean Delvare <jdelvare@suse.de>
To:     platform-driver-x86@vger.kernel.org
Cc:     LKML <linux-kernel@vger.kernel.org>, Nikita@imap2.suse-dmz.suse.de,
        "Kravets <teackot"@gmail.com, Hans de Goede <hdegoede@redhat.com>,
        Mark Gross <markgross@kernel.org>
Subject: [PATCH] platform/x86: msi-ec: Fix the build
Message-ID: <20230805101010.54d49e91@endymion.delvare>
Organization: SUSE Linux
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

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 const=
ant
    { SM_ECO_NAME,     0xc2 },
      ^~~~~~~~~~~
drivers/platform/x86/msi-ec.c:72:6: note: (near initialization for =E2=80=
=98CONF0.shift_mode.modes[0].name=E2=80=99)
drivers/platform/x86/msi-ec.c:73:6: error: initializer element is not const=
ant
    { SM_COMFORT_NAME, 0xc1 },
      ^~~~~~~~~~~~~~~
drivers/platform/x86/msi-ec.c:73:6: note: (near initialization for =E2=80=
=98CONF0.shift_mode.modes[1].name=E2=80=99)
drivers/platform/x86/msi-ec.c:74:6: error: initializer element is not const=
ant
    { SM_SPORT_NAME,   0xc0 },
      ^~~~~~~~~~~~~
drivers/platform/x86/msi-ec.c:74:6: note: (near initialization for =E2=80=
=98CONF0.shift_mode.modes[2].name=E2=80=99)
(...)

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>
---
 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>
=20
-static const char *const SM_ECO_NAME       =3D "eco";
-static const char *const SM_COMFORT_NAME   =3D "comfort";
-static const char *const SM_SPORT_NAME     =3D "sport";
-static const char *const SM_TURBO_NAME     =3D "turbo";
+#define SM_ECO_NAME		"eco"
+#define SM_COMFORT_NAME		"comfort"
+#define SM_SPORT_NAME		"sport"
+#define SM_TURBO_NAME		"turbo"
=20
-static const char *const FM_AUTO_NAME     =3D "auto";
-static const char *const FM_SILENT_NAME   =3D "silent";
-static const char *const FM_BASIC_NAME    =3D "basic";
-static const char *const FM_ADVANCED_NAME =3D "advanced";
+#define FM_AUTO_NAME		"auto"
+#define FM_SILENT_NAME		"silent"
+#define FM_BASIC_NAME		"basic"
+#define FM_ADVANCED_NAME	"advanced"
=20
 static const char * const ALLOWED_FW_0[] __initconst =3D {
 	"14C1EMS1.012",


--=20
Jean Delvare
SUSE L3 Support