efi/gop: Remove redundant current_fb_base
authorArvind Sankar <nivedita@alum.mit.edu>
Fri, 20 Mar 2020 02:00:15 +0000 (22:00 -0400)
committerArd Biesheuvel <ardb@kernel.org>
Thu, 23 Apr 2020 18:15:06 +0000 (20:15 +0200)
current_fb_base isn't used for anything except assigning to fb_base if
we locate a suitable gop.

Signed-off-by: Arvind Sankar <nivedita@alum.mit.edu>
Link: https://lore.kernel.org/r/20200320020028.1936003-2-nivedita@alum.mit.edu
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
drivers/firmware/efi/libstub/gop.c

index 55e6b3f..f40d535 100644 (file)
@@ -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,