GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arch/x86/smbios.c: Trim some `len` variables 

Reduce the scope or remove some `len` variables. This is done to ease
replacing `sizeof` on struct types in a follow-up commit, by ensuring
that all to-be-replaced appearances follow the variable declarations.

Change-Id: Ied38fcaf87ef5b1e4f93076b4ba2898ad1f98a72
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/55903
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Rudolph <siro@das-labor.org>
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
This commit is contained in:
Angel Pons 2021-06-28 15:52:37 +02:00 committed by Werner Zeh
parent 808692b4f4
commit c6dab80b1c
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/arch/x86/smbios.c
View File

@ -902,7 +902,6 @@ int smbios_write_type8(unsigned long *current, int *handle,
const struct port_information *port, const struct port_information *port,
size_t num_ports) size_t num_ports)
{ {
int len = sizeof(struct smbios_type8);
unsigned int totallen = 0, i; unsigned int totallen = 0, i;
for (i = 0; i < num_ports; i++, port++) { for (i = 0; i < num_ports; i++, port++) {
@ -910,7 +909,7 @@ int smbios_write_type8(unsigned long *current, int *handle,
memset(t, 0, sizeof(struct smbios_type8)); memset(t, 0, sizeof(struct smbios_type8));
t->type = SMBIOS_PORT_CONNECTOR_INFORMATION; t->type = SMBIOS_PORT_CONNECTOR_INFORMATION;
t->handle = *handle; t->handle = *handle;
t->length = len - 2; t->length = sizeof(struct smbios_type8) - 2;
t->internal_reference_designator = t->internal_reference_designator =
smbios_add_string(t->eos, port->internal_reference_designator); smbios_add_string(t->eos, port->internal_reference_designator);
t->internal_connector_type = port->internal_connector_type; t->internal_connector_type = port->internal_connector_type;
@ -1041,7 +1040,6 @@ static int smbios_write_type16(unsigned long *current, int *handle)
static int smbios_write_type17(unsigned long *current, int *handle, int type16) static int smbios_write_type17(unsigned long *current, int *handle, int type16)
{ {
int len = sizeof(struct smbios_type17);
int totallen = 0; int totallen = 0;
int i; int i;
@ -1060,7 +1058,7 @@ static int smbios_write_type17(unsigned long *current, int *handle, int type16)
* Otherwise, the physical installed memory size is guessed from the system * Otherwise, the physical installed memory size is guessed from the system
* memory map, which results in a slightly smaller value than the actual size. * memory map, which results in a slightly smaller value than the actual size.
*/ */
len = create_smbios_type17_for_dimm(dimm, current, handle, type16); const int len = create_smbios_type17_for_dimm(dimm, current, handle, type16);
*current += len; *current += len;
totallen += len; totallen += len;
} }
@ -1070,7 +1068,6 @@ static int smbios_write_type17(unsigned long *current, int *handle, int type16)
static int smbios_write_type19(unsigned long *current, int *handle, int type16) static int smbios_write_type19(unsigned long *current, int *handle, int type16)
{ {
struct smbios_type19 *t = (struct smbios_type19 *)*current; struct smbios_type19 *t = (struct smbios_type19 *)*current;
int len = sizeof(struct smbios_type19);
int i; int i;
struct memory_info *meminfo; struct memory_info *meminfo;
@ -1081,7 +1078,7 @@ static int smbios_write_type19(unsigned long *current, int *handle, int type16)
memset(t, 0, sizeof(struct smbios_type19)); memset(t, 0, sizeof(struct smbios_type19));
t->type = SMBIOS_MEMORY_ARRAY_MAPPED_ADDRESS; t->type = SMBIOS_MEMORY_ARRAY_MAPPED_ADDRESS;
t->length = len - 2; t->length = sizeof(struct smbios_type19) - 2;
t->handle = *handle; t->handle = *handle;
t->memory_array_handle = type16; t->memory_array_handle = type16;
@ -1112,7 +1109,7 @@ static int smbios_write_type19(unsigned long *current, int *handle, int type16)
t->extended_ending_address--; t->extended_ending_address--;
} }
len = t->length + smbios_string_table_len(t->eos); const int len = t->length + smbios_string_table_len(t->eos);
*current += len; *current += len;
*handle += 1; *handle += 1;
return len; return len;