efiboot: Reuse GOP info struct

[Klemens Nanni]

gopi is only used for filling ei after info's last usage. info is more
descriptive imho and reusing it gets rid of the extra variable.

Feedback?


diff --git a/sys/arch/amd64/stand/efiboot/efiboot.c 
b/sys/arch/amd64/stand/efiboot/efiboot.c
index 42e79fbea6b..1ed2968bffa 100644
--- a/sys/arch/amd64/stand/efiboot/efiboot.c
+++ b/sys/arch/amd64/stand/efiboot/efiboot.c
@@ -720,12 +720,10 @@ efi_makebootargs(void)
        EFI_STATUS               status;
        EFI_GRAPHICS_OUTPUT     *gop;
        EFI_GRAPHICS_OUTPUT_MODE_INFORMATION
-                               *gopi;
+                               *info;
        bios_efiinfo_t           ei;
        int                      curmode, bestmode = -1;
        UINTN                    sz, gopsiz, bestsiz = 0;
-       EFI_GRAPHICS_OUTPUT_MODE_INFORMATION
-                               *info;
 
        memset(&ei, 0, sizeof(ei));
        /*
@@ -766,8 +764,8 @@ efi_makebootargs(void)
                                (void)efi_gop_setmode(gop, curmode);
                }
 
-               gopi = gop->Mode->Info;
-               switch (gopi->PixelFormat) {
+               info = gop->Mode->Info;
+               switch (info->PixelFormat) {
                case PixelBlueGreenRedReserved8BitPerColor:
                        ei.fb_red_mask      = 0x00ff0000;
                        ei.fb_green_mask    = 0x0000ff00;
@@ -781,20 +779,20 @@ efi_makebootargs(void)
                        ei.fb_reserved_mask = 0xff000000;
                        break;
                case PixelBitMask:
-                       ei.fb_red_mask = gopi->PixelInformation.RedMask;
-                       ei.fb_green_mask = gopi->PixelInformation.GreenMask;
-                       ei.fb_blue_mask = gopi->PixelInformation.BlueMask;
+                       ei.fb_red_mask = info->PixelInformation.RedMask;
+                       ei.fb_green_mask = info->PixelInformation.GreenMask;
+                       ei.fb_blue_mask = info->PixelInformation.BlueMask;
                        ei.fb_reserved_mask =
-                           gopi->PixelInformation.ReservedMask;
+                           info->PixelInformation.ReservedMask;
                        break;
                default:
                        break;
                }
                ei.fb_addr = gop->Mode->FrameBufferBase;
                ei.fb_size = gop->Mode->FrameBufferSize;
-               ei.fb_height = gopi->VerticalResolution;
-               ei.fb_width = gopi->HorizontalResolution;
-               ei.fb_pixpsl = gopi->PixelsPerScanLine;
+               ei.fb_height = info->VerticalResolution;
+               ei.fb_width = info->HorizontalResolution;
+               ei.fb_pixpsl = info->PixelsPerScanLine;
        }
 
        addbootarg(BOOTARG_EFIINFO, sizeof(ei), &ei);