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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 33ED1C32754 for ; Tue, 6 Aug 2019 21:41:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EE90B21743 for ; Tue, 6 Aug 2019 21:41:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565127709; bh=7En+Uebl9aJbjV40+FjObfOWb+/DYw9Rh6wiEK6ch5A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=jGEds3/n7i2WJ4fIPkeZYerPitxhNA9lyMyxL+wW2I30wV2UHWhf7Eyfz8VFeLV9Z 6LAT1bgc0T7T0Yg74PM5N/7TPniBygomouv9jLvMjwgw+GtJ636r79AeCrC1DLyAvX jbJvNILWZ9zaRnTj4zz3H8tFkM91rE8hra1vF+tw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728667AbfHFVlj (ORCPT ); Tue, 6 Aug 2019 17:41:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:53776 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728773AbfHFVf7 (ORCPT ); Tue, 6 Aug 2019 17:35:59 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 41BA421874; Tue, 6 Aug 2019 21:35:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1565127358; bh=7En+Uebl9aJbjV40+FjObfOWb+/DYw9Rh6wiEK6ch5A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Mv1pGGQsnobeO4rm419t/SK3sWftBN38arr/T1nAZ242tnFm4viEuIch2zcFK//cE x+IZu9h+1tPjQZATYUnLStgBqaEcN5ytX+hoTXJo33jSGrEKq82TMryhxNhWTYmQkA GI/8lZ93yfOA+TVUejWdEdw3T9H8tAM8V71Fwxgw= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Qian Cai , Will Deacon , Catalin Marinas , Sasha Levin , linux-efi@vger.kernel.org Subject: [PATCH AUTOSEL 4.19 20/32] arm64/efi: fix variable 'si' set but not used Date: Tue, 6 Aug 2019 17:35:08 -0400 Message-Id: <20190806213522.19859-20-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190806213522.19859-1-sashal@kernel.org> References: <20190806213522.19859-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-efi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-efi@vger.kernel.org From: Qian Cai [ 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 7ed320895d1f4..f52a2968a3b69 100644 --- a/arch/arm64/include/asm/efi.h +++ b/arch/arm64/include/asm/efi.h @@ -94,7 +94,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