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 D9850C433F5 for ; Wed, 10 Nov 2021 23:01:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BEE7B61269 for ; Wed, 10 Nov 2021 23:01:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234244AbhKJXDr (ORCPT ); Wed, 10 Nov 2021 18:03:47 -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=20Wei=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=20Wei=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 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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); -- 2.33.1