From patchwork Wed Aug 31 01:12:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michel Lespinasse X-Patchwork-Id: 601685 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D764AECAAA1 for ; Wed, 31 Aug 2022 01:49:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230466AbiHaBt3 (ORCPT ); Tue, 30 Aug 2022 21:49:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49460 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230029AbiHaBt3 (ORCPT ); Tue, 30 Aug 2022 21:49:29 -0400 Received: from server.lespinasse.org (server.lespinasse.org [IPv6:2001:470:82ab::100:0]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0DB57AD99D; Tue, 30 Aug 2022 18:49:27 -0700 (PDT) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=lespinasse.org; i=@lespinasse.org; q=dns/txt; s=srv-83-ed; t=1661908369; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : from; bh=zrzsrwj0wClSUEOaE4YZoUIMY9GUyLtBeJ8Vw6+yGMw=; b=ohR/KvlJlyYwfRM5s2fVY6j73vy4qK/uU7GQrrm+TqSZZf2/iDK93SzmjK58rEt61nnHB h00ZeMQnWEjNa6/Dg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lespinasse.org; i=@lespinasse.org; q=dns/txt; s=srv-83-rsa; t=1661908369; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : from; bh=zrzsrwj0wClSUEOaE4YZoUIMY9GUyLtBeJ8Vw6+yGMw=; b=KQz0v4yKIDowJncFA9xIIURPwTBxjDtQPSPNGsVMHZjPXys03iy6WyV+LxPLJtTq/Eo1Y 7puiNKi06JPV8M/ZbIgaiw3mAfw/gtJvb1q9i1gvE7AYihCRUca56vJYL7zG0IX6+pAvZOS iKzEHgJZrGh9GQhHDy57kW+of6PKZe7ouxsIcv4qeJztVDFJTCkfQ4eLxP6qANIC1q0gBX7 GFpO+lX2pK45UvlYV75R4Ms7p39y0d6NqWUzCkuU732OiC/34XBGtZYqA7t6qtdk1jxxdt/ u7nZxWaxk9WcKXRX8AhWMefxSNM7KhSsPqugTECze8b1xfBGKeiuCmB9JJCw== Received: from zeus.lespinasse.org (zeus.lespinasse.org [10.0.0.150]) by server.lespinasse.org (Postfix) with ESMTPS id 12B8516051F; Tue, 30 Aug 2022 18:12:49 -0700 (PDT) Received: by zeus.lespinasse.org (Postfix, from userid 1000) id 0315320162; Tue, 30 Aug 2022 18:12:49 -0700 (PDT) From: Michel Lespinasse To: Michael Roth , Ard Biesheuvel Cc: linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org, Michel Lespinasse Subject: [PATCH 1/4] Remove unused variable et in efi_get_system_table() Date: Tue, 30 Aug 2022 18:12:45 -0700 Message-Id: <20220831011248.28632-2-michel@lespinasse.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220831011248.28632-1-michel@lespinasse.org> References: <20220831011248.28632-1-michel@lespinasse.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-efi@vger.kernel.org This avoids a build warning with CONFIG_EFI enabled. Fixes: 7c4146e88855 (x86/compressed/acpi: Move EFI detection to helper) Signed-off-by: Michel Lespinasse --- arch/x86/boot/compressed/efi.c | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/x86/boot/compressed/efi.c b/arch/x86/boot/compressed/efi.c index 6edd034b0b30..c42ee7874eb9 100644 --- a/arch/x86/boot/compressed/efi.c +++ b/arch/x86/boot/compressed/efi.c @@ -59,7 +59,6 @@ unsigned long efi_get_system_table(struct boot_params *bp) { unsigned long sys_tbl_pa; struct efi_info *ei; - enum efi_type et; /* Get systab from boot params. */ ei = &bp->efi_info; From patchwork Wed Aug 31 01:12:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michel Lespinasse X-Patchwork-Id: 601990 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 25D73ECAAD5 for ; Wed, 31 Aug 2022 01:49:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231424AbiHaBta (ORCPT ); Tue, 30 Aug 2022 21:49:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49462 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229811AbiHaBt3 (ORCPT ); Tue, 30 Aug 2022 21:49:29 -0400 Received: from server.lespinasse.org (server.lespinasse.org [IPv6:2001:470:82ab::100:0]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0DC39AD9AA; Tue, 30 Aug 2022 18:49:27 -0700 (PDT) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=lespinasse.org; i=@lespinasse.org; q=dns/txt; s=srv-83-ed; t=1661908369; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : from; bh=vSoUAaOGn/xCpVT7xIuPnYP+3A9mzSdbLNxp3aYE+kE=; b=Yvg7XcIa5aGW2rfkDbtI21478eJwnjnmzSWQbJFzY3XZAFMAjZmCP1VnfgceCg70fEHVh /RIh444getTgrpsDQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lespinasse.org; i=@lespinasse.org; q=dns/txt; s=srv-83-rsa; t=1661908369; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : from; bh=vSoUAaOGn/xCpVT7xIuPnYP+3A9mzSdbLNxp3aYE+kE=; b=YQLAL6BEHSu2bC2CY0ZQtDRppemfZXBLUCYheqGu2jCqwcEs5sPIKVG7jwlcE/BC3PXLR t66N94V9KRPgFx+5EEctstB7f1AsZeNEUOMQpyIJmVQ+Lpr18lOt03GN22EOLnq2sePWTvZ GWv3mZPFXk3f3x7aEN5zbs+PlWX6oH9grcFHIEcHgYWimHOEhbPon76lslAuzoSpFYSlmbx PiedHm3nLUtJhzoVwC9xntCM+wJomc0gUlPYmtjNaYcZ8cQpmohiI2gEZgejFz94rH5pr1a HOUU5O207YdG4fB4L8zTAZiD+6ImJPrxHhsMmuD4u8FE+kAeb2cP7TXYv+Lg== Received: from zeus.lespinasse.org (zeus.lespinasse.org [IPv6:fd00::150:0]) by server.lespinasse.org (Postfix) with ESMTPS id 21580160523; Tue, 30 Aug 2022 18:12:49 -0700 (PDT) Received: by zeus.lespinasse.org (Postfix, from userid 1000) id 058E3201FC; Tue, 30 Aug 2022 18:12:49 -0700 (PDT) From: Michel Lespinasse To: Michael Roth , Ard Biesheuvel Cc: linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org, Michel Lespinasse Subject: [PATCH 2/4] Remove unused variable nr_tables in efi_get_rsdp_addr() Date: Tue, 30 Aug 2022 18:12:46 -0700 Message-Id: <20220831011248.28632-3-michel@lespinasse.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220831011248.28632-1-michel@lespinasse.org> References: <20220831011248.28632-1-michel@lespinasse.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-efi@vger.kernel.org This avoids a build warning with CONFIG_EFI enabled. Fixes: 61c14ceda840 (x86/compressed/acpi: Move EFI config table lookup to helper) Signed-off-by: Michel Lespinasse --- arch/x86/boot/compressed/acpi.c | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/x86/boot/compressed/acpi.c b/arch/x86/boot/compressed/acpi.c index 9caf89063e77..83a7977ef56f 100644 --- a/arch/x86/boot/compressed/acpi.c +++ b/arch/x86/boot/compressed/acpi.c @@ -52,7 +52,6 @@ static acpi_physical_address efi_get_rsdp_addr(void) unsigned long cfg_tbl_pa = 0; unsigned int cfg_tbl_len; unsigned long systab_pa; - unsigned int nr_tables; enum efi_type et; int ret; From patchwork Wed Aug 31 01:12:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michel Lespinasse X-Patchwork-Id: 601989 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B3E8CECAAD8 for ; Wed, 31 Aug 2022 01:49:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229720AbiHaBtc (ORCPT ); Tue, 30 Aug 2022 21:49:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49478 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231620AbiHaBtb (ORCPT ); Tue, 30 Aug 2022 21:49:31 -0400 X-Greylist: delayed 1201 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Tue, 30 Aug 2022 18:49:28 PDT Received: from server.lespinasse.org (server.lespinasse.org [63.205.204.226]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0DBACAD9A3; Tue, 30 Aug 2022 18:49:27 -0700 (PDT) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=lespinasse.org; i=@lespinasse.org; q=dns/txt; s=srv-83-ed; t=1661908369; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : from; bh=dQJIwUvhGNjX092Phs0xdl9MfbbYPTx9oCj6UYxXh5g=; b=4HicKEvVRL7E+lmDSjVEcLsiD1QOTMNuQstm3DwBEfZeieP4K7ucrTb5EXfjM3P05/pSW dWd55+sR2b1smcpDw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lespinasse.org; i=@lespinasse.org; q=dns/txt; s=srv-83-rsa; t=1661908369; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : from; bh=dQJIwUvhGNjX092Phs0xdl9MfbbYPTx9oCj6UYxXh5g=; b=mVEewu2UAPsTPNp59LLDa0lr52qDw0DsqGkGsj3OFX6udzMDK2TNzsfuJIfrkDfXdr6IQ sBcg1xVdT6npNX0UeozgG5vVqcNwi9xbl0+Kb6ZPIQGh8Z/ozDBsxeT8/ZZFAPv4Umt7Dc1 +9czjjOk6/bb9PMPNXGUc4DiMkQmAX6HK93HBLIN7VtZ+VbcOFKfv7vQzbEPZLDqHmssT+V JldWMNaGfqvRgt5v02SfodN3yLqPFG3HYpiRP63Yap9ORVUMdxWBkBjvRA3iPs5XyFtCZXX keLheD2piRC658c8hdCHwQBOngM7V6cQQZKlyFM6YhK6PRWy8+UrQwIh6ohw== Received: from zeus.lespinasse.org (zeus.lespinasse.org [10.0.0.150]) by server.lespinasse.org (Postfix) with ESMTPS id 1A824160522; Tue, 30 Aug 2022 18:12:49 -0700 (PDT) Received: by zeus.lespinasse.org (Postfix, from userid 1000) id 08997203E1; Tue, 30 Aug 2022 18:12:49 -0700 (PDT) From: Michel Lespinasse To: Michael Roth , Ard Biesheuvel Cc: linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org, Michel Lespinasse Subject: [PATCH 3/4] Remove unused variable ret in efi_get_conf_table() Date: Tue, 30 Aug 2022 18:12:47 -0700 Message-Id: <20220831011248.28632-4-michel@lespinasse.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220831011248.28632-1-michel@lespinasse.org> References: <20220831011248.28632-1-michel@lespinasse.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-efi@vger.kernel.org This avoids a build warning with CONFIG_EFI enabled. Fixes: 61c14ceda840 (x86/compressed/acpi: Move EFI config table lookup to helper) Signed-off-by: Michel Lespinasse --- arch/x86/boot/compressed/efi.c | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/x86/boot/compressed/efi.c b/arch/x86/boot/compressed/efi.c index c42ee7874eb9..6ffd22710ed2 100644 --- a/arch/x86/boot/compressed/efi.c +++ b/arch/x86/boot/compressed/efi.c @@ -130,7 +130,6 @@ int efi_get_conf_table(struct boot_params *bp, unsigned long *cfg_tbl_pa, { unsigned long sys_tbl_pa; enum efi_type et; - int ret; if (!cfg_tbl_pa || !cfg_tbl_len) return -EINVAL; From patchwork Wed Aug 31 01:12:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michel Lespinasse X-Patchwork-Id: 601686 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5A6D3ECAAA1 for ; Wed, 31 Aug 2022 01:29:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229871AbiHaB33 (ORCPT ); Tue, 30 Aug 2022 21:29:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52856 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229449AbiHaB32 (ORCPT ); Tue, 30 Aug 2022 21:29:28 -0400 Received: from server.lespinasse.org (server.lespinasse.org [IPv6:2001:470:82ab::100:0]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9E018B0B30 for ; Tue, 30 Aug 2022 18:29:27 -0700 (PDT) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=lespinasse.org; i=@lespinasse.org; q=dns/txt; s=srv-83-ed; t=1661908369; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : from; bh=T80tVGeeu2pNX6r4SyDC31jnBdPqXosCrg4+diPypRI=; b=F8SV8l+9s3sa7Ue0csxKYcXV3g8Fb8K1d05osoDq3i+/IoLAGBMuZYHO6+YEyxV/FFEcQ Oi0/yKgo0ZzQ3RgAQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lespinasse.org; i=@lespinasse.org; q=dns/txt; s=srv-83-rsa; t=1661908369; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : from; bh=T80tVGeeu2pNX6r4SyDC31jnBdPqXosCrg4+diPypRI=; b=elLk/ZmyTh70+A+BuevYD5PchLZUtZ+gbP3/gOCkAb0yOINaCOTZ7PqmnCh6bpuWMn1pe 5YzUQ5WH2PmX7h92QksK1ytvsvJzqOuW9T3ilnqUzZIpBbGg6hljpj4/nBCaI0F/sZAHYbQ jKRijJmbs3z5ZitT3uSvhEInzIMzP3L/Zx2a3fK6zCLcmrJUw+hs+NRZNamj+HoS/ojQn8X Drah4VgZKB2T6Qhc9yGlqeekiW9DhCholNC5fPbXOTtG5UrWMMMA7rIKXeDccI6x0vgaQln prPRI8Vsuy+Ey/vIAel/tpAUlOmYZufkermyUIHU/uVz2MPdlbR78atfWwrw== Received: from zeus.lespinasse.org (zeus.lespinasse.org [IPv6:fd00::150:0]) by server.lespinasse.org (Postfix) with ESMTPS id 22323160525; Tue, 30 Aug 2022 18:12:49 -0700 (PDT) Received: by zeus.lespinasse.org (Postfix, from userid 1000) id 0B94C20407; Tue, 30 Aug 2022 18:12:49 -0700 (PDT) From: Michel Lespinasse To: Michael Roth , Ard Biesheuvel Cc: linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org, Michel Lespinasse Subject: [PATCH 4/4] Remove unused variable ret in __efi_get_rsdp_addr() Date: Tue, 30 Aug 2022 18:12:48 -0700 Message-Id: <20220831011248.28632-5-michel@lespinasse.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20220831011248.28632-1-michel@lespinasse.org> References: <20220831011248.28632-1-michel@lespinasse.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-efi@vger.kernel.org This avoids a build warning with CONFIG_EFI enabled. Fixes: dee602dd5d14 (x86/compressed/acpi: Move EFI vendor table lookup to helper) Signed-off-by: Michel Lespinasse --- arch/x86/boot/compressed/acpi.c | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/x86/boot/compressed/acpi.c b/arch/x86/boot/compressed/acpi.c index 83a7977ef56f..21febd9f21ab 100644 --- a/arch/x86/boot/compressed/acpi.c +++ b/arch/x86/boot/compressed/acpi.c @@ -24,7 +24,6 @@ __efi_get_rsdp_addr(unsigned long cfg_tbl_pa, unsigned int cfg_tbl_len) { #ifdef CONFIG_EFI unsigned long rsdp_addr; - int ret; /* * Search EFI system tables for RSDP. Preferred is ACPI_20_TABLE_GUID to