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>

diff --git a/drivers/firmware/efi/libstub/gop.c b/drivers/firmware/efi/libstub/gop.c
index a7d3efe36c78acc34c629447c6893113dacb6f43..0d195060a370033efec173155be67e1045e1f019 100644 (file)
--- 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);