From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001

From: Darren Kenny <darren.kenny@oracle.com>

Date: Tue, 8 Dec 2020 21:14:31 +0000

Subject: [PATCH] video/efi_gop: Remove unnecessary return value of

 grub_video_gop_fill_mode_info()

The return value of grub_video_gop_fill_mode_info() is never able to be

anything other than GRUB_ERR_NONE. So, rather than continue to return

a value and checking it each time, it is more correct to redefine the

function to not return anything and remove checks of its return value

altogether.

Fixes: CID 96701

Signed-off-by: Darren Kenny <darren.kenny@oracle.com>

Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>

---

 grub-core/video/efi_gop.c | 25 ++++++-------------------

 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/grub-core/video/efi_gop.c b/grub-core/video/efi_gop.c

index c9e40e8d4e9..9fcc41ac03c 100644

--- a/grub-core/video/efi_gop.c

+++ b/grub-core/video/efi_gop.c

@@ -229,7 +229,7 @@ grub_video_gop_fill_real_mode_info (unsigned mode,

   return GRUB_ERR_NONE;

 }

-static grub_err_t

+static void

 grub_video_gop_fill_mode_info (unsigned mode,

 			       struct grub_efi_gop_mode_info *in,

 			       struct grub_video_mode_info *out)

@@ -254,8 +254,6 @@ grub_video_gop_fill_mode_info (unsigned mode,

   out->blit_format = GRUB_VIDEO_BLIT_FORMAT_BGRA_8888;

   out->mode_type |= (GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED

 		     | GRUB_VIDEO_MODE_TYPE_UPDATING_SWAP);

-

-  return GRUB_ERR_NONE;

 }

 static int

@@ -268,7 +266,6 @@ grub_video_gop_iterate (int (*hook) (const struct grub_video_mode_info *info, vo

       grub_efi_uintn_t size;

       grub_efi_status_t status;

       struct grub_efi_gop_mode_info *info = NULL;

-      grub_err_t err;

       struct grub_video_mode_info mode_info;

       status = efi_call_4 (gop->query_mode, gop, mode, &size, &info;;

@@ -279,12 +276,7 @@ grub_video_gop_iterate (int (*hook) (const struct grub_video_mode_info *info, vo

 	  continue;

 	}

-      err = grub_video_gop_fill_mode_info (mode, info, &mode_info);

-      if (err)

-	{

-	  grub_errno = GRUB_ERR_NONE;

-	  continue;

-	}

+      grub_video_gop_fill_mode_info (mode, info, &mode_info);

       if (hook (&mode_info, hook_arg))

 	return 1;

     }

@@ -468,13 +460,8 @@ grub_video_gop_setup (unsigned int width, unsigned int height,

   info = gop->mode->info;

-  err = grub_video_gop_fill_mode_info (gop->mode->mode, info,

-				       &framebuffer.mode_info);

-  if (err)

-    {

-      grub_dprintf ("video", "GOP: couldn't fill mode info\n");

-      return err;

-    }

+  grub_video_gop_fill_mode_info (gop->mode->mode, info,

+				 &framebuffer.mode_info);

   framebuffer.ptr = (void *) (grub_addr_t) gop->mode->fb_base;

   framebuffer.offscreen

@@ -488,8 +475,8 @@ grub_video_gop_setup (unsigned int width, unsigned int height,

     {

       grub_dprintf ("video", "GOP: couldn't allocate shadow\n");

       grub_errno = 0;

-      err = grub_video_gop_fill_mode_info (gop->mode->mode, info,

-					   &framebuffer.mode_info);

+      grub_video_gop_fill_mode_info (gop->mode->mode, info,

+				     &framebuffer.mode_info);

       buffer = framebuffer.ptr;

     }