Skip to content

Commit bd45870

Browse files
nivedita76ardbiesheuvel
authored andcommitted
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: Arvind Sankar <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Ard Biesheuvel <[email protected]>
1 parent 87cd637 commit bd45870

File tree

1 file changed

+1
-3
lines changed
  • drivers/firmware/efi/libstub

1 file changed

+1
-3
lines changed

drivers/firmware/efi/libstub/gop.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@ static efi_status_t setup_gop(struct screen_info *si, efi_guid_t *proto,
108108
efi_guid_t conout_proto = EFI_CONSOLE_OUT_DEVICE_GUID;
109109
bool conout_found = false;
110110
void *dummy = NULL;
111-
efi_physical_addr_t current_fb_base;
112111

113112
status = efi_bs_call(handle_protocol, h, proto, (void **)&gop);
114113
if (status != EFI_SUCCESS)
@@ -120,7 +119,6 @@ static efi_status_t setup_gop(struct screen_info *si, efi_guid_t *proto,
120119

121120
mode = efi_table_attr(gop, mode);
122121
info = efi_table_attr(mode, info);
123-
current_fb_base = efi_table_attr(mode, frame_buffer_base);
124122

125123
if ((!first_gop || conout_found) &&
126124
info->pixel_format != PIXEL_BLT_ONLY) {
@@ -136,7 +134,7 @@ static efi_status_t setup_gop(struct screen_info *si, efi_guid_t *proto,
136134
pixel_format = info->pixel_format;
137135
pixel_info = info->pixel_information;
138136
pixels_per_scan_line = info->pixels_per_scan_line;
139-
fb_base = current_fb_base;
137+
fb_base = efi_table_attr(mode, frame_buffer_base);
140138

141139
/*
142140
* Once we've found a GOP supporting ConOut,

0 commit comments

Comments
 (0)