From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1426204AbdEZLhO (ORCPT ); Fri, 26 May 2017 07:37:14 -0400 Received: from mail-wm0-f54.google.com ([74.125.82.54]:35567 "EHLO mail-wm0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1426169AbdEZLg6 (ORCPT ); Fri, 26 May 2017 07:36:58 -0400 From: Matt Fleming To: Ingo Molnar , Thomas Gleixner , "H . Peter Anvin" Cc: Arnd Bergmann , Ard Biesheuvel , linux-kernel@vger.kernel.org, linux-efi@vger.kernel.org, Matt Fleming , David Howells , Josh Boyer Subject: [PATCH 2/5] efi: Remove duplicate 'const' specifiers Date: Fri, 26 May 2017 12:36:48 +0100 Message-Id: <20170526113652.21339-3-matt@codeblueprint.co.uk> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170526113652.21339-1-matt@codeblueprint.co.uk> References: <20170526113652.21339-1-matt@codeblueprint.co.uk> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arnd Bergmann gcc-7 shows a harmless warning: drivers/firmware/efi/libstub/secureboot.c:19:27: error: duplicate 'const' declaration specifier [-Werror=duplicate-decl-specifier] static const efi_char16_t const efi_SecureBoot_name[] = { drivers/firmware/efi/libstub/secureboot.c:22:27: error: duplicate 'const' declaration specifier [-Werror=duplicate-decl-specifier] Removing one of the specifiers gives us the expected behavior. Fixes: de8cb458625c ("efi: Get and store the secure boot status") Signed-off-by: Arnd Bergmann Acked-by: Ard Biesheuvel Reviewed-by: David Howells Cc: Josh Boyer Cc: Ingo Molnar Signed-off-by: Matt Fleming --- drivers/firmware/efi/libstub/secureboot.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/firmware/efi/libstub/secureboot.c b/drivers/firmware/efi/libstub/secureboot.c index 8c34d50a4d80..959777ec8a77 100644 --- a/drivers/firmware/efi/libstub/secureboot.c +++ b/drivers/firmware/efi/libstub/secureboot.c @@ -16,10 +16,10 @@ /* BIOS variables */ static const efi_guid_t efi_variable_guid = EFI_GLOBAL_VARIABLE_GUID; -static const efi_char16_t const efi_SecureBoot_name[] = { +static const efi_char16_t efi_SecureBoot_name[] = { 'S', 'e', 'c', 'u', 'r', 'e', 'B', 'o', 'o', 't', 0 }; -static const efi_char16_t const efi_SetupMode_name[] = { +static const efi_char16_t efi_SetupMode_name[] = { 'S', 'e', 't', 'u', 'p', 'M', 'o', 'd', 'e', 0 }; -- 2.12.2