From a0833959aa9aadaedd3241abb7fc74fe7dfa919f Mon Sep 17 00:00:00 2001 From: Yuchen He Date: Wed, 22 Mar 2023 00:34:35 +0100 Subject: mb/google/poppy/rammus: rework method get_wifi_sar_cbfs_filename The return statement at the end of the method is never reached. Remove it. Also while at it, assign the return value of variant_board_sku() to ski_id while the variable declaration and make it const. Signed-off-by: Yuchen He Change-Id: If05df8934f68ffec9ad21c88394055f71d618133 Reviewed-on: https://review.coreboot.org/c/coreboot/+/73867 Tested-by: build bot (Jenkins) Reviewed-by: Eric Lai Reviewed-by: Felix Singer --- src/mainboard/google/poppy/variants/rammus/mainboard.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/mainboard/google/poppy/variants/rammus/mainboard.c b/src/mainboard/google/poppy/variants/rammus/mainboard.c index 9892dda46d..90cf7cec61 100644 --- a/src/mainboard/google/poppy/variants/rammus/mainboard.c +++ b/src/mainboard/google/poppy/variants/rammus/mainboard.c @@ -33,13 +33,10 @@ const char *smbios_system_sku(void) const char *get_wifi_sar_cbfs_filename(void) { - uint32_t sku_id; + const uint32_t sku_id = variant_board_sku(); - sku_id = variant_board_sku(); if (sku_id & 0x200) return "wifi_sar-shyvana.hex"; else return "wifi_sar-leona.hex"; - - return WIFI_SAR_CBFS_DEFAULT_FILENAME; } -- cgit v1.2.3