1From fc5951d3b1616055ef81a019a5affc09d13344d0 Mon Sep 17 00:00:00 2001
2From: Darren Kenny <darren.kenny@oracle.com>
3Date: Tue, 8 Dec 2020 21:14:31 +0000
4Subject: [PATCH] video/efi_gop: Remove unnecessary return value of
5 grub_video_gop_fill_mode_info()
6
7The return value of grub_video_gop_fill_mode_info() is never able to be
8anything other than GRUB_ERR_NONE. So, rather than continue to return
9a value and checking it each time, it is more correct to redefine the
10function to not return anything and remove checks of its return value
11altogether.
12
13Fixes: CID 96701
14
15Signed-off-by: Darren Kenny <darren.kenny@oracle.com>
16Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
17Signed-off-by: Stefan Sørensen <stefan.sorensen@spectralink.com>
18---
19 grub-core/video/efi_gop.c | 25 ++++++-------------------
20 1 file changed, 6 insertions(+), 19 deletions(-)
21
22diff --git a/grub-core/video/efi_gop.c b/grub-core/video/efi_gop.c
23index 7f9d1c2..db2ee98 100644
24--- a/grub-core/video/efi_gop.c
25+++ b/grub-core/video/efi_gop.c
26@@ -227,7 +227,7 @@ grub_video_gop_fill_real_mode_info (unsigned mode,
27   return GRUB_ERR_NONE;
28 }
29
30-static grub_err_t
31+static void
32 grub_video_gop_fill_mode_info (unsigned mode,
33 			       struct grub_efi_gop_mode_info *in,
34 			       struct grub_video_mode_info *out)
35@@ -252,8 +252,6 @@ grub_video_gop_fill_mode_info (unsigned mode,
36   out->blit_format = GRUB_VIDEO_BLIT_FORMAT_BGRA_8888;
37   out->mode_type |= (GRUB_VIDEO_MODE_TYPE_DOUBLE_BUFFERED
38 		     | GRUB_VIDEO_MODE_TYPE_UPDATING_SWAP);
39-
40-  return GRUB_ERR_NONE;
41 }
42
43 static int
44@@ -266,7 +264,6 @@ grub_video_gop_iterate (int (*hook) (const struct grub_video_mode_info *info, vo
45       grub_efi_uintn_t size;
46       grub_efi_status_t status;
47       struct grub_efi_gop_mode_info *info = NULL;
48-      grub_err_t err;
49       struct grub_video_mode_info mode_info;
50
51       status = efi_call_4 (gop->query_mode, gop, mode, &size, &info);
52@@ -277,12 +274,7 @@ grub_video_gop_iterate (int (*hook) (const struct grub_video_mode_info *info, vo
53 	  continue;
54 	}
55
56-      err = grub_video_gop_fill_mode_info (mode, info, &mode_info);
57-      if (err)
58-	{
59-	  grub_errno = GRUB_ERR_NONE;
60-	  continue;
61-	}
62+      grub_video_gop_fill_mode_info (mode, info, &mode_info);
63       if (hook (&mode_info, hook_arg))
64 	return 1;
65     }
66@@ -466,13 +458,8 @@ grub_video_gop_setup (unsigned int width, unsigned int height,
67
68   info = gop->mode->info;
69
70-  err = grub_video_gop_fill_mode_info (gop->mode->mode, info,
71-				       &framebuffer.mode_info);
72-  if (err)
73-    {
74-      grub_dprintf ("video", "GOP: couldn't fill mode info\n");
75-      return err;
76-    }
77+  grub_video_gop_fill_mode_info (gop->mode->mode, info,
78+				 &framebuffer.mode_info);
79
80   framebuffer.ptr = (void *) (grub_addr_t) gop->mode->fb_base;
81   framebuffer.offscreen
82@@ -486,8 +473,8 @@ grub_video_gop_setup (unsigned int width, unsigned int height,
83     {
84       grub_dprintf ("video", "GOP: couldn't allocate shadow\n");
85       grub_errno = 0;
86-      err = grub_video_gop_fill_mode_info (gop->mode->mode, info,
87-					   &framebuffer.mode_info);
88+      grub_video_gop_fill_mode_info (gop->mode->mode, info,
89+				     &framebuffer.mode_info);
90       buffer = framebuffer.ptr;
91     }
92
93--
942.14.2
95
96