From d4a46375dacaa82f9d8f3884e45c6972eeca082e Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Tue, 9 Aug 2022 06:35:43 +0200 Subject: [PATCH] pickit2_spi.c: Use one variable to store raw parameter values Currently, each programmer parameter has their own temp variable to store their raw value into it. That's not needed since these variables are only used for a short time to do some configuration and stay unused then. Thus, use only one variable for all of them. Signed-off-by: Felix Singer Change-Id: Ib4ebc0e6354aad007145e1b0a761d9011c59ff7c Reviewed-on: https://review.coreboot.org/c/flashrom/+/66571 Tested-by: build bot (Jenkins) Reviewed-by: Thomas Heijligen --- pickit2_spi.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pickit2_spi.c b/pickit2_spi.c index a0fcbb891..9e34a58e8 100644 --- a/pickit2_spi.c +++ b/pickit2_spi.c @@ -410,28 +410,30 @@ static int pickit2_spi_init(void) libusb_device_handle *pickit2_handle; struct pickit2_spi_data *pickit2_data; int spispeed_idx = 0; - char *spispeed = extract_programmer_param_str("spispeed"); - if (spispeed != NULL) { + char *param_str; + + param_str = extract_programmer_param_str("spispeed"); + if (param_str != NULL) { int i = 0; for (; spispeeds[i].name; i++) { - if (strcasecmp(spispeeds[i].name, spispeed) == 0) { + if (strcasecmp(spispeeds[i].name, param_str) == 0) { spispeed_idx = i; break; } } if (spispeeds[i].name == NULL) { msg_perr("Error: Invalid 'spispeed' value.\n"); - free(spispeed); + free(param_str); return 1; } - free(spispeed); + free(param_str); } int millivolt = 3500; - char *voltage = extract_programmer_param_str("voltage"); - if (voltage != NULL) { - millivolt = parse_voltage(voltage); - free(voltage); + param_str = extract_programmer_param_str("voltage"); + if (param_str != NULL) { + millivolt = parse_voltage(param_str); + free(param_str); if (millivolt < 0) return 1; }