From 631cd29efbcd030d8c3fe3ce3c9d98562b306007 Mon Sep 17 00:00:00 2001 From: Angel Pons Date: Mon, 28 Jun 2021 15:40:58 +0200 Subject: [PATCH] mb/pcengines/apuX: Refactor to avoid dead assignment MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The initial value of `len` is never used. Declare and initialise all local variables in a single statement to avoid this problem. Change-Id: Ieb96758f4cd19d9d3f8fdc543e8ca17db06a2123 Signed-off-by: Angel Pons Reviewed-on: https://review.coreboot.org/c/coreboot/+/55905 Tested-by: build bot (Jenkins) Reviewed-by: Michał Żygowski Reviewed-by: Tim Wawrzynczak --- src/mainboard/pcengines/apu1/mainboard.c | 9 +++------ src/mainboard/pcengines/apu2/mainboard.c | 9 +++------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/src/mainboard/pcengines/apu1/mainboard.c b/src/mainboard/pcengines/apu1/mainboard.c index 05c496dc57..187f8cff3c 100644 --- a/src/mainboard/pcengines/apu1/mainboard.c +++ b/src/mainboard/pcengines/apu1/mainboard.c @@ -168,14 +168,11 @@ static void config_addon_uart(void) #if CONFIG(GENERATE_SMBIOS_TABLES) static int mainboard_smbios_type16(DMI_INFO *agesa_dmi, int *handle, unsigned long *current) { - struct smbios_type16 *t; - u32 max_capacity; - int len; + const u32 max_capacity = get_spd_offset() ? 4 : 2; /* 4GB or 2GB variant */ - t = (struct smbios_type16 *)*current; - len = sizeof(*t); + struct smbios_type16 *t = (struct smbios_type16 *)*current; + int len = sizeof(*t); memset(t, 0, len); - max_capacity = get_spd_offset() ? 4 : 2; /* 4GB or 2GB variant */ t->type = SMBIOS_PHYS_MEMORY_ARRAY; t->handle = *handle; diff --git a/src/mainboard/pcengines/apu2/mainboard.c b/src/mainboard/pcengines/apu2/mainboard.c index bcf2536237..2c3b861d38 100644 --- a/src/mainboard/pcengines/apu2/mainboard.c +++ b/src/mainboard/pcengines/apu2/mainboard.c @@ -150,14 +150,11 @@ static void config_gpio_mux(void) static int mainboard_smbios_type16(DMI_INFO *agesa_dmi, int *handle, unsigned long *current) { - struct smbios_type16 *t; - u32 max_capacity; - int len = 0; + const u32 max_capacity = get_spd_offset() ? 4 : 2; /* 4GB or 2GB variant */ - t = (struct smbios_type16 *)*current; - len = sizeof(*t); + struct smbios_type16 *t = (struct smbios_type16 *)*current; + int len = sizeof(*t); memset(t, 0, len); - max_capacity = get_spd_offset() ? 4 : 2; /* 4GB or 2GB variant */ t->type = SMBIOS_PHYS_MEMORY_ARRAY; t->handle = *handle;