0079-video-efi_gop-Remove-unnecessary-return-value-of-gru.patch 3.2 KB

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