From 9979be74822ecb963277c85ec58946f16e4b98f5 Mon Sep 17 00:00:00 2001 From: Jeremy Compostella Date: Fri, 9 May 2025 11:08:48 -0700 Subject: [PATCH] drivers/intel/fsp2_0: Remove redundant NULL checks and simplify code This commit refactors the code by eliminating unnecessary NULL pointer checks for the `efi_bmp_image_header header` parameter in several functions. The calling function `fsp_convert_bmp_to_gop_blt` already verifies that the `header` pointer is not NULL before invoking these functions, rendering these checks redundant. Similarly, checks for `adjusted_x` and `adjusted_y` in `calculate_adj_height_width` have been removed. This streamlines the code and reduces unnecessary operations. Additionally, the `is_bmp_image_compressed` function has been simplified for improved readability by directly returning the result of the compression type comparison. Change-Id: Ia8afcac0fb21633e379f5d8b9713ba6f8b92c1c8 Signed-off-by: Jeremy Compostella Reviewed-on: https://review.coreboot.org/c/coreboot/+/87616 Reviewed-by: Zhixing Ma Tested-by: build bot (Jenkins) Reviewed-by: Wonkyu Kim Reviewed-by: Cliff Huang Reviewed-by: Subrata Banik --- src/drivers/intel/fsp2_0/fsp_gop_blt.c | 32 +------------------------- 1 file changed, 1 insertion(+), 31 deletions(-) diff --git a/src/drivers/intel/fsp2_0/fsp_gop_blt.c b/src/drivers/intel/fsp2_0/fsp_gop_blt.c index 2ab716c4b7..32d28e873c 100644 --- a/src/drivers/intel/fsp2_0/fsp_gop_blt.c +++ b/src/drivers/intel/fsp2_0/fsp_gop_blt.c @@ -9,9 +9,6 @@ static bool is_bmp_image_valid(efi_bmp_image_header *header) { - if (header == NULL) - return false; - /* Check if the BMP Header Signature is valid */ if (header->CharB != 'B' || header->CharM != 'M') return false; @@ -31,20 +28,11 @@ static bool is_bmp_image_valid(efi_bmp_image_header *header) static bool is_bmp_image_compressed(efi_bmp_image_header *header) { - if (header == NULL) - return false; - - if (header->CompressionType != 0) - return true; - - return false; + return header->CompressionType != 0; } static bool is_bitmap_format_supported(efi_bmp_image_header *header) { - if (header == NULL) - return false; - /* * Check BITMAP format is supported * BMP_IMAGE_HEADER = BITMAP_FILE_HEADER + BITMAP_INFO_HEADER @@ -58,9 +46,6 @@ static bool is_bitmap_format_supported(efi_bmp_image_header *header) static bool do_bmp_image_authentication(efi_bmp_image_header *header) { - if (header == NULL) - return false; - if (!is_bmp_image_valid(header)) { printk(BIOS_ERR, "%s: BMP Image Header is invalid.\n", __func__); return false; @@ -88,9 +73,6 @@ static uint32_t calculate_blt_buffer_size(efi_bmp_image_header *header) { uint32_t blt_buffer_size; - if (header == NULL) - return 0; - /* Calculate the size required for BLT buffer */ blt_buffer_size = header->PixelWidth * header->PixelHeight * sizeof(efi_graphics_output_blt_pixel); @@ -104,9 +86,6 @@ static int get_color_map_num(efi_bmp_image_header *header) { int col_map_number; - if (header == NULL) - return -1; - switch (header->BitPerPixel) { case 1: col_map_number = 2; @@ -176,9 +155,6 @@ static int get_color_map_num(efi_bmp_image_header *header) static bool calculate_adj_height_width(const efi_bmp_image_header *header, size_t *adjusted_x, size_t *adjusted_y, enum lb_fb_orientation orientation, int blt_width, int blt_height) { - if (!header || !adjusted_x || !adjusted_y) - return false; - size_t flipped_x = header->PixelWidth - blt_width - 1; size_t flipped_y = header->PixelHeight - blt_height - 1; @@ -248,9 +224,6 @@ static efi_graphics_output_blt_pixel *get_gop_blt_pixel( size_t gop_y; size_t gop_width; - if (!header || !gop_blt_buffer) - return NULL; - switch (orientation) { case LB_FB_ORIENTATION_LEFT_UP: case LB_FB_ORIENTATION_RIGHT_UP: @@ -324,9 +297,6 @@ static void *fill_blt_buffer(efi_bmp_image_header *header, efi_bmp_color_map *bmp_color_map; size_t image_index; - if (header == NULL) - return NULL; - gop_blt_ptr = malloc(sizeof(blt_buffer_size)); if (!gop_blt_ptr) die("%s: out of memory. Consider increasing the `CONFIG_HEAP_SIZE`\n",