summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYuchen He <yuchenhe126@gmail.com>2023-03-22 00:34:35 +0100
committerFelix Singer <felixsinger@posteo.net>2023-03-23 00:17:29 +0000
commita0833959aa9aadaedd3241abb7fc74fe7dfa919f (patch)
tree2054557612e7ebd81f69a0b8545b89827768e4c5
parent7f5a52cc63292a6b02dd64dcf0c9795a2dae014d (diff)
downloadcoreboot-a0833959aa9aadaedd3241abb7fc74fe7dfa919f.tar.gz
coreboot-a0833959aa9aadaedd3241abb7fc74fe7dfa919f.tar.bz2
coreboot-a0833959aa9aadaedd3241abb7fc74fe7dfa919f.zip
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 <yuchenhe126@gmail.com> Change-Id: If05df8934f68ffec9ad21c88394055f71d618133 Reviewed-on: https://review.coreboot.org/c/coreboot/+/73867 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Eric Lai <eric_lai@quanta.corp-partner.google.com> Reviewed-by: Felix Singer <felixsinger@posteo.net>
-rw-r--r--src/mainboard/google/poppy/variants/rammus/mainboard.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/mainboard/google/poppy/variants/rammus/mainboard.c b/src/mainboard/google/poppy/variants/rammus/mainboard.c
index 9892dda46d60..90cf7cec611f 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;
}