diff options
| author | Arvind Sankar <nivedita@alum.mit.edu> | 2020-03-19 22:00:20 -0400 |
|---|---|---|
| committer | Ard Biesheuvel <ardb@kernel.org> | 2020-04-23 20:15:06 +0200 |
| commit | e484c594ba0e34686ad8780287961d09a3b4169b (patch) | |
| tree | 836725357e5e0449d6197dd114fd333a2009c0de /drivers/firmware/efi/libstub/gop.c | |
| parent | 8e0a22e2b0531870e61110d12b1d37d6b5d24eed (diff) | |
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 <nivedita@alum.mit.edu>
Link: https://lore.kernel.org/r/20200320020028.1936003-7-nivedita@alum.mit.edu
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Diffstat (limited to 'drivers/firmware/efi/libstub/gop.c')
| -rw-r--r-- | drivers/firmware/efi/libstub/gop.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/firmware/efi/libstub/gop.c b/drivers/firmware/efi/libstub/gop.c index a7d3efe36c78..0d195060a370 100644 --- a/drivers/firmware/efi/libstub/gop.c +++ b/drivers/firmware/efi/libstub/gop.c @@ -88,16 +88,19 @@ setup_pixel_info(struct screen_info *si, u32 pixels_per_scan_line, static efi_graphics_output_protocol_t * find_gop(efi_guid_t *proto, unsigned long size, void **handles) { - efi_graphics_output_protocol_t *gop, *first_gop; - efi_graphics_output_protocol_mode_t *mode; - efi_graphics_output_mode_info_t *info = NULL; - efi_status_t status; + efi_graphics_output_protocol_t *first_gop; efi_handle_t h; int i; first_gop = NULL; for_each_efi_handle(h, handles, size, i) { + efi_status_t status; + + efi_graphics_output_protocol_t *gop; + efi_graphics_output_protocol_mode_t *mode; + efi_graphics_output_mode_info_t *info; + efi_guid_t conout_proto = EFI_CONSOLE_OUT_DEVICE_GUID; void *dummy = NULL; @@ -136,7 +139,7 @@ static efi_status_t setup_gop(struct screen_info *si, efi_guid_t *proto, { efi_graphics_output_protocol_t *gop; efi_graphics_output_protocol_mode_t *mode; - efi_graphics_output_mode_info_t *info = NULL; + efi_graphics_output_mode_info_t *info; efi_physical_addr_t fb_base; gop = find_gop(proto, size, handles); |