From patchwork Wed Nov 10 23:00:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Patchwork-Id: 12613581 X-Patchwork-Delegate: jikos@jikos.cz Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 594C6C433FE for ; Wed, 10 Nov 2021 23:00:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 43ECD61350 for ; Wed, 10 Nov 2021 23:00:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234200AbhKJXDl (ORCPT ); Wed, 10 Nov 2021 18:03:41 -0500 Received: from todd.t-8ch.de ([159.69.126.157]:39497 "EHLO todd.t-8ch.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234180AbhKJXDk (ORCPT ); Wed, 10 Nov 2021 18:03:40 -0500 From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=weissschuh.net; s=mail; t=1636585249; bh=jgSV9Z9MqHjSxHGGmmXPD4jqhlmIQznQK2wX8feu1ng=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tiGqZQ5v1W5buGFpAkz4UgDOJRJ6NtK/pMnlsP/XLKEQjIZh6plDL7oAFRq1UF05m nxIC05QrIK2nYJpNEcpVtAP8mNzBCBDwOZt754TT5Hmw7ec60Wo8Rer8nttEBrSy+T kjbkoi2J88VSnBhFJANyrbGS31+Is03mo4CrX6co= To: Nathan Chancellor , linux-input@vger.kernel.org, Jiri Kosina , Benjamin Tissoires Cc: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= , linux-kernel@vger.kernel.org, Srinivas Pandruvada , Rushikesh S Kadam , Benson Leung , Enric Balletbo i Serra , Guenter Roeck , llvm@lists.linux.dev Subject: [PATCH 1/4] HID: intel-ish-hid: fw-loader: constify devicetable initializer Date: Thu, 11 Nov 2021 00:00:40 +0100 Message-Id: <20211110230043.701167-1-linux@weissschuh.net> X-Mailer: git-send-email 2.33.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org Previously the compilation broke on clang and gcc < 8.1.0 with errors like "error: initializer element is not constant". Fixes: 44e2a58cb880 ("HID: intel-ish-hid: fw-loader: only load for matching devices") Reported-by: Nathan Chancellor Signed-off-by: Thomas Weißschuh --- drivers/hid/intel-ish-hid/ishtp-fw-loader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) base-commit: 64355db3caf6468dc711995239efe0cbcd7d0091 diff --git a/drivers/hid/intel-ish-hid/ishtp-fw-loader.c b/drivers/hid/intel-ish-hid/ishtp-fw-loader.c index 945a9d0b68cd..26f376faf0e6 100644 --- a/drivers/hid/intel-ish-hid/ishtp-fw-loader.c +++ b/drivers/hid/intel-ish-hid/ishtp-fw-loader.c @@ -76,9 +76,9 @@ enum ish_loader_commands { #define LOADER_XFER_MODE_ISHTP BIT(1) /* ISH Transport Loader client unique GUID */ -static const guid_t loader_ishtp_guid = - GUID_INIT(0xc804d06a, 0x55bd, 0x4ea7, - 0xad, 0xed, 0x1e, 0x31, 0x22, 0x8c, 0x76, 0xdc); +#define ISHTP_GUID GUID_INIT(0xc804d06a, 0x55bd, 0x4ea7, \ + 0xad, 0xed, 0x1e, 0x31, 0x22, 0x8c, 0x76, 0xdc) +static const guid_t loader_ishtp_guid = ISHTP_GUID; #define FILENAME_SIZE 256 @@ -1064,7 +1064,7 @@ static struct ishtp_cl_driver loader_ishtp_cl_driver = { }; static const struct ishtp_device_id loader_ishtp_id_table[] = { - { loader_ishtp_guid }, + { ISHTP_GUID }, { } }; MODULE_DEVICE_TABLE(ishtp, loader_ishtp_id_table); From patchwork Wed Nov 10 23:00:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Patchwork-Id: 12613577 X-Patchwork-Delegate: jikos@jikos.cz Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 54239C433F5 for ; Wed, 10 Nov 2021 23:00:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 399C361279 for ; Wed, 10 Nov 2021 23:00:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234187AbhKJXDk (ORCPT ); Wed, 10 Nov 2021 18:03:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46516 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234182AbhKJXDj (ORCPT ); Wed, 10 Nov 2021 18:03:39 -0500 Received: from todd.t-8ch.de (todd.t-8ch.de [IPv6:2a01:4f8:c010:41de::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EA334C061767; Wed, 10 Nov 2021 15:00:51 -0800 (PST) From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=weissschuh.net; s=mail; t=1636585249; bh=JNTYqQ2cqHeyvdtglZHIL3kmDnAz5/OnGEDYq81CnOg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gdF0b8DxjCDbSGQinTCpxRSnAPUmwWFG/0LOw3UrBSVruA6YtOg/QEAaeF7theQ1e AcbYbWwf5zYAlzORmA2mFdEbC7q7Lr/m2Jo5xk6ap97V4HHOt8yAUB8ZifNtuXFpF0 gfsfRDZRYrCIUydW5XYjQEXjZSjm4wJNtP25DV54= To: Nathan Chancellor , linux-input@vger.kernel.org, Jiri Kosina , Benjamin Tissoires Cc: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= , linux-kernel@vger.kernel.org, Srinivas Pandruvada , Rushikesh S Kadam , Benson Leung , Enric Balletbo i Serra , Guenter Roeck , llvm@lists.linux.dev Subject: [PATCH 2/4] HID: intel-ish-hid: hid-client: constify devicetable initializer Date: Thu, 11 Nov 2021 00:00:41 +0100 Message-Id: <20211110230043.701167-2-linux@weissschuh.net> X-Mailer: git-send-email 2.33.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org Previously the compilation broke on clang and gcc < 8.1.0 with errors like "error: initializer element is not constant". Fixes: 0d0cccc0fd83 ("HID: intel-ish-hid: hid-client: only load for matching devices") Reported-by: Nathan Chancellor Signed-off-by: Thomas Weißschuh --- drivers/hid/intel-ish-hid/ishtp-hid-client.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/hid/intel-ish-hid/ishtp-hid-client.c b/drivers/hid/intel-ish-hid/ishtp-hid-client.c index fb47d38d1e87..cff7da0578b6 100644 --- a/drivers/hid/intel-ish-hid/ishtp-hid-client.c +++ b/drivers/hid/intel-ish-hid/ishtp-hid-client.c @@ -12,9 +12,9 @@ #include "ishtp-hid.h" /* ISH Transport protocol (ISHTP in short) GUID */ -static const guid_t hid_ishtp_guid = - GUID_INIT(0x33AECD58, 0xB679, 0x4E54, - 0x9B, 0xD9, 0xA0, 0x4D, 0x34, 0xF0, 0xC2, 0x26); +#define HID_ISHTP_GUID GUID_INIT(0x33AECD58, 0xB679, 0x4E54, \ + 0x9B, 0xD9, 0xA0, 0x4D, 0x34, 0xF0, 0xC2, 0x26) +static const guid_t hid_ishtp_guid = HID_ISHTP_GUID; /* Rx ring buffer pool size */ #define HID_CL_RX_RING_SIZE 32 @@ -953,7 +953,7 @@ static struct ishtp_cl_driver hid_ishtp_cl_driver = { }; static const struct ishtp_device_id hid_ishtp_id_table[] = { - { hid_ishtp_guid }, + { HID_ISHTP_GUID }, { } }; MODULE_DEVICE_TABLE(ishtp, hid_ishtp_id_table); From patchwork Wed Nov 10 23:00:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Patchwork-Id: 12613579 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id CE991C433EF for ; Wed, 10 Nov 2021 23:00:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BAACA6128E for ; Wed, 10 Nov 2021 23:00:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233987AbhKJXDk (ORCPT ); Wed, 10 Nov 2021 18:03:40 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46514 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234071AbhKJXDj (ORCPT ); Wed, 10 Nov 2021 18:03:39 -0500 Received: from todd.t-8ch.de (todd.t-8ch.de [IPv6:2a01:4f8:c010:41de::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EA205C061766; Wed, 10 Nov 2021 15:00:51 -0800 (PST) From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=weissschuh.net; s=mail; t=1636585249; bh=Y5o2gmy5NesHvtQl0fjBOlhMoxRkLPEq9aVwfTh8pyk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jqHRX+PBkna5H1Npx+9oR6XosmPgl5IR7nTtv/OYKI7qD8YWkuHEF3XGdxUMss95w DyOx2oQiXxJ/vbzbgQgbtc1A4jb3OTVEzihrShWt4zae6r03y/z8w/8uyfNiywS2HS mK+0ww91l68kpTIBJHwfX+yPOoZ3C3Q+66QJGnio= To: Nathan Chancellor , linux-input@vger.kernel.org, Jiri Kosina , Benjamin Tissoires Cc: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= , linux-kernel@vger.kernel.org, Srinivas Pandruvada , Rushikesh S Kadam , Benson Leung , Enric Balletbo i Serra , Guenter Roeck , llvm@lists.linux.dev Subject: [PATCH 3/4] platform/chrome: chros_ec_ishtp: constify devicetable initializer Date: Thu, 11 Nov 2021 00:00:42 +0100 Message-Id: <20211110230043.701167-3-linux@weissschuh.net> X-Mailer: git-send-email 2.33.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org Previously the compilation broke on clang and gcc < 8.1.0 with errors like "error: initializer element is not constant". Fixes: facfe0a4fdce ("platform/chrome: chros_ec_ishtp: only load for matching devices") Reported-by: Nathan Chancellor Signed-off-by: Thomas Weißschuh --- drivers/platform/chrome/cros_ec_ishtp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/platform/chrome/cros_ec_ishtp.c b/drivers/platform/chrome/cros_ec_ishtp.c index 8c17358e84c1..2e635fee854c 100644 --- a/drivers/platform/chrome/cros_ec_ishtp.c +++ b/drivers/platform/chrome/cros_ec_ishtp.c @@ -41,9 +41,9 @@ enum cros_ec_ish_channel { #define ISHTP_SEND_TIMEOUT (3 * HZ) /* ISH Transport CrOS EC ISH client unique GUID */ -static const guid_t cros_ish_guid = - GUID_INIT(0x7b7154d0, 0x56f4, 0x4bdc, - 0xb0, 0xd8, 0x9e, 0x7c, 0xda, 0xe0, 0xd6, 0xa0); +#define CROS_ISH_GUID GUID_INIT(0x7b7154d0, 0x56f4, 0x4bdc, \ + 0xb0, 0xd8, 0x9e, 0x7c, 0xda, 0xe0, 0xd6, 0xa0) +static const guid_t cros_ish_guid = CROS_ISH_GUID; struct header { u8 channel; @@ -775,7 +775,7 @@ static struct ishtp_cl_driver cros_ec_ishtp_driver = { }; static const struct ishtp_device_id cros_ec_ishtp_id_table[] = { - { cros_ish_guid }, + { CROS_ISH_GUID }, { } }; MODULE_DEVICE_TABLE(ishtp, cros_ec_ishtp_id_table); From patchwork Wed Nov 10 23:00:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Patchwork-Id: 12613583 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C91E8C43219 for ; Wed, 10 Nov 2021 23:00:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B2F3361279 for ; Wed, 10 Nov 2021 23:00:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234182AbhKJXDl (ORCPT ); Wed, 10 Nov 2021 18:03:41 -0500 Received: from todd.t-8ch.de ([159.69.126.157]:59497 "EHLO todd.t-8ch.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234160AbhKJXDk (ORCPT ); Wed, 10 Nov 2021 18:03:40 -0500 From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=weissschuh.net; s=mail; t=1636585249; bh=6kSupYZDrrsHghwFMyadPlA4UhiFyStheLD/192wm+o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=o3y0RPznS/RR/KNrbekAGSaScQ/aOyHT6fGqZ1Ul0AwwNAjmOO4if6Lb0uFHA4kbx ZRpKFTBtIRsiiLZ8+C3Z2gWUlAdnbWIO4NY8tbUPi5tnFpkfG+TlVrAttngbM5kUv7 HZvn/rVB/hj9dVT7TdIfAIvJ3H98J7bb8ii7P21E= To: Nathan Chancellor , linux-input@vger.kernel.org, Jiri Kosina , Benjamin Tissoires Cc: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= , linux-kernel@vger.kernel.org, Srinivas Pandruvada , Rushikesh S Kadam , Benson Leung , Enric Balletbo i Serra , Guenter Roeck , llvm@lists.linux.dev Subject: [PATCH 4/4] platform/x86: isthp_eclite: constify devicetable initializer Date: Thu, 11 Nov 2021 00:00:43 +0100 Message-Id: <20211110230043.701167-4-linux@weissschuh.net> X-Mailer: git-send-email 2.33.1 In-Reply-To: References: MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org Previously the compilation broke on clang and gcc < 8.1.0 with errors like "error: initializer element is not constant". Fixes: f155dfeaa4ee ("platform/x86: isthp_eclite: only load for matching devices") Reported-by: Nathan Chancellor Signed-off-by: Thomas Weißschuh --- drivers/platform/x86/intel/ishtp_eclite.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/platform/x86/intel/ishtp_eclite.c b/drivers/platform/x86/intel/ishtp_eclite.c index b9fb8f28fd63..d6709d5c77fd 100644 --- a/drivers/platform/x86/intel/ishtp_eclite.c +++ b/drivers/platform/x86/intel/ishtp_eclite.c @@ -93,9 +93,9 @@ struct ishtp_opregion_dev { }; /* eclite ishtp client UUID: 6a19cc4b-d760-4de3-b14d-f25ebd0fbcd9 */ -static const guid_t ecl_ishtp_guid = - GUID_INIT(0x6a19cc4b, 0xd760, 0x4de3, - 0xb1, 0x4d, 0xf2, 0x5e, 0xbd, 0xf, 0xbc, 0xd9); +#define ECL_ISHTP_GUID GUID_INIT(0x6a19cc4b, 0xd760, 0x4de3, \ + 0xb1, 0x4d, 0xf2, 0x5e, 0xbd, 0xf, 0xbc, 0xd9) +static const guid_t ecl_ishtp_guid = ECL_ISHTP_GUID; /* ACPI DSM UUID: 91d936a7-1f01-49c6-a6b4-72f00ad8d8a5 */ static const guid_t ecl_acpi_guid = @@ -682,7 +682,7 @@ static struct ishtp_cl_driver ecl_ishtp_cl_driver = { }; static const struct ishtp_device_id ecl_ishtp_id_table[] = { - { ecl_ishtp_guid }, + { ECL_ISHTP_GUID }, { } }; MODULE_DEVICE_TABLE(ishtp, ecl_ishtp_id_table);