From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7D348C3A5A1 for ; Thu, 22 Aug 2019 17:36:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 50BD520856 for ; Thu, 22 Aug 2019 17:36:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566495402; bh=y5dEBJo+pyR6FD5vWwH/sBCnZFvh5ro0DnCopAwpIwU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=SgdHHfTLdGlKNUsDQut44TWqtNk2lb6VZrkGTcaDpnDMarJxEzMJXsDVn1EaiKacr 9pxmd3lKsqHbdyJIR7CLPuauQDIwomep3LdEZQ1c1sFriJ+pUxgUoX/uFeMmFnBQ2g futu6BxGuN79pzCqwakjqg1LhiK1pG3uUehKiAaE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2392540AbfHVRgl (ORCPT ); Thu, 22 Aug 2019 13:36:41 -0400 Received: from mail.kernel.org ([198.145.29.99]:47042 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391558AbfHVRYt (ORCPT ); Thu, 22 Aug 2019 13:24:49 -0400 Received: from localhost (wsip-184-188-36-2.sd.sd.cox.net [184.188.36.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id EBAE823426; Thu, 22 Aug 2019 17:24:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1566494688; bh=y5dEBJo+pyR6FD5vWwH/sBCnZFvh5ro0DnCopAwpIwU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=e5J3doqj1YJEIdzq8NCi/xlKifSjk0YfMXbKFPuPey3wCjsBmVItDgZOqIUixornr a47a+8LseVql6wCeJWeQ5tEMm115OMPAy7L+JElQrFirP954FFQPYNfqQnjz7H0kas 3S/Z+ycBN+RJO58Bx2rVgo2DQYJj7YKb62EIkLbI= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Will Deacon , Qian Cai , Catalin Marinas , Sasha Levin Subject: [PATCH 4.14 34/71] arm64/efi: fix variable si set but not used Date: Thu, 22 Aug 2019 10:19:09 -0700 Message-Id: <20190822171729.396589393@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20190822171726.131957995@linuxfoundation.org> References: <20190822171726.131957995@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org [ Upstream commit f1d4836201543e88ebe70237e67938168d5fab19 ] GCC throws out this warning on arm64. drivers/firmware/efi/libstub/arm-stub.c: In function 'efi_entry': drivers/firmware/efi/libstub/arm-stub.c:132:22: warning: variable 'si' set but not used [-Wunused-but-set-variable] Fix it by making free_screen_info() a static inline function. Acked-by: Will Deacon Signed-off-by: Qian Cai Signed-off-by: Catalin Marinas Signed-off-by: Sasha Levin --- arch/arm64/include/asm/efi.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/arm64/include/asm/efi.h b/arch/arm64/include/asm/efi.h index 8389050328bba..5585420860694 100644 --- a/arch/arm64/include/asm/efi.h +++ b/arch/arm64/include/asm/efi.h @@ -89,7 +89,11 @@ static inline unsigned long efi_get_max_initrd_addr(unsigned long dram_base, ((protocol##_t *)instance)->f(instance, ##__VA_ARGS__) #define alloc_screen_info(x...) &screen_info -#define free_screen_info(x...) + +static inline void free_screen_info(efi_system_table_t *sys_table_arg, + struct screen_info *si) +{ +} /* redeclare as 'hidden' so the compiler will generate relative references */ extern struct screen_info screen_info __attribute__((__visibility__("hidden"))); -- 2.20.1