Skip to content

Commit e484c59

Browse files
nivedita76ardbiesheuvel
authored andcommitted
efi/gop: Move variable declarations into loop block
Declare the variables inside the block where they're used. Get rid of a couple of redundant initializers. Signed-off-by: Arvind Sankar <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Ard Biesheuvel <[email protected]>
1 parent 8e0a22e commit e484c59

File tree

1 file changed

+8
-5
lines changed
  • drivers/firmware/efi/libstub

1 file changed

+8
-5
lines changed

drivers/firmware/efi/libstub/gop.c

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,16 +88,19 @@ setup_pixel_info(struct screen_info *si, u32 pixels_per_scan_line,
8888
static efi_graphics_output_protocol_t *
8989
find_gop(efi_guid_t *proto, unsigned long size, void **handles)
9090
{
91-
efi_graphics_output_protocol_t *gop, *first_gop;
92-
efi_graphics_output_protocol_mode_t *mode;
93-
efi_graphics_output_mode_info_t *info = NULL;
94-
efi_status_t status;
91+
efi_graphics_output_protocol_t *first_gop;
9592
efi_handle_t h;
9693
int i;
9794

9895
first_gop = NULL;
9996

10097
for_each_efi_handle(h, handles, size, i) {
98+
efi_status_t status;
99+
100+
efi_graphics_output_protocol_t *gop;
101+
efi_graphics_output_protocol_mode_t *mode;
102+
efi_graphics_output_mode_info_t *info;
103+
101104
efi_guid_t conout_proto = EFI_CONSOLE_OUT_DEVICE_GUID;
102105
void *dummy = NULL;
103106

@@ -136,7 +139,7 @@ static efi_status_t setup_gop(struct screen_info *si, efi_guid_t *proto,
136139
{
137140
efi_graphics_output_protocol_t *gop;
138141
efi_graphics_output_protocol_mode_t *mode;
139-
efi_graphics_output_mode_info_t *info = NULL;
142+
efi_graphics_output_mode_info_t *info;
140143
efi_physical_addr_t fb_base;
141144

142145
gop = find_gop(proto, size, handles);

0 commit comments

Comments
 (0)