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,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 AA682C54FD0 for ; Fri, 24 Apr 2020 13:08:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8B56E20736 for ; Fri, 24 Apr 2020 13:08:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587733702; bh=N8WHCZTXoYVd4HikAPCUeH5omQc/d7QvplV5w5DjrJc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ZaeaEPsDkRYS2DBjUrZhTuUSis1M037SBhRbYEavhMyxO1YvMSrvfwVlyH5ull32r VPxh34TiiUpmllZTMHReQfbhoWgPqfettsUFfj7uCc+LXEJgwcssPq80SHP7yjQfID qNLkFOnMefgDXv0+Z7IXV2PgBrvG9UbpGlY40WzI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728503AbgDXNIV (ORCPT ); Fri, 24 Apr 2020 09:08:21 -0400 Received: from mail.kernel.org ([198.145.29.99]:56724 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727832AbgDXNGY (ORCPT ); Fri, 24 Apr 2020 09:06:24 -0400 Received: from e123331-lin.home (amontpellier-657-1-18-247.w109-210.abo.wanadoo.fr [109.210.65.247]) (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 B3E7F208E4; Fri, 24 Apr 2020 13:06:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1587733583; bh=N8WHCZTXoYVd4HikAPCUeH5omQc/d7QvplV5w5DjrJc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lHjiZgxdXjR19WURXyNO0lmUEVNnlAOHUwUbY/wnZ9QUEfvIXfzoQaf/FxL7Gxaow YHxRRUXYI5n4PO7+K9PgHIUiqwUKVq+QRby0CsAHuMABoznxKpPd/M9AWpMknbZTSx UDxM/ZdgfG1pbrCToQjt6uoH6sk2L8J1y+zw8El8= From: Ard Biesheuvel To: linux-efi@vger.kernel.org, Ingo Molnar , Thomas Gleixner Cc: Ard Biesheuvel , linux-kernel@vger.kernel.org, Arvind Sankar , Atish Patra , Palmer Dabbelt , Zou Wei Subject: [PATCH 05/33] efi/gop: Remove redundant current_fb_base Date: Fri, 24 Apr 2020 15:05:03 +0200 Message-Id: <20200424130531.30518-6-ardb@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200424130531.30518-1-ardb@kernel.org> References: <20200424130531.30518-1-ardb@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arvind Sankar current_fb_base isn't used for anything except assigning to fb_base if we locate a suitable gop. Signed-off-by: Arvind Sankar Link: https://lore.kernel.org/r/20200320020028.1936003-2-nivedita@alum.mit.edu Signed-off-by: Ard Biesheuvel --- drivers/firmware/efi/libstub/gop.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/firmware/efi/libstub/gop.c b/drivers/firmware/efi/libstub/gop.c index 55e6b3f286fe..f40d535dccb8 100644 --- a/drivers/firmware/efi/libstub/gop.c +++ b/drivers/firmware/efi/libstub/gop.c @@ -108,7 +108,6 @@ static efi_status_t setup_gop(struct screen_info *si, efi_guid_t *proto, efi_guid_t conout_proto = EFI_CONSOLE_OUT_DEVICE_GUID; bool conout_found = false; void *dummy = NULL; - efi_physical_addr_t current_fb_base; status = efi_bs_call(handle_protocol, h, proto, (void **)&gop); if (status != EFI_SUCCESS) @@ -120,7 +119,6 @@ static efi_status_t setup_gop(struct screen_info *si, efi_guid_t *proto, mode = efi_table_attr(gop, mode); info = efi_table_attr(mode, info); - current_fb_base = efi_table_attr(mode, frame_buffer_base); if ((!first_gop || conout_found) && info->pixel_format != PIXEL_BLT_ONLY) { @@ -136,7 +134,7 @@ static efi_status_t setup_gop(struct screen_info *si, efi_guid_t *proto, pixel_format = info->pixel_format; pixel_info = info->pixel_information; pixels_per_scan_line = info->pixels_per_scan_line; - fb_base = current_fb_base; + fb_base = efi_table_attr(mode, frame_buffer_base); /* * Once we've found a GOP supporting ConOut, -- 2.17.1