Commit bd458704 authored by Arvind Sankar's avatar Arvind Sankar Committed by Ard Biesheuvel
Browse files

efi/gop: Remove redundant current_fb_base 



current_fb_base isn't used for anything except assigning to fb_base if
we locate a suitable gop.

Signed-off-by: default avatarArvind Sankar <nivedita@alum.mit.edu>
Link: https://lore.kernel.org/r/20200320020028.1936003-2-nivedita@alum.mit.edu


Signed-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
parent 87cd6378

drivers/firmware/efi/libstub/gop.c

+1 −3
Original line number Diff line number Diff line
@@ -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,

CRA Git | Maintained and supported by SUSTech CRA and CCSE