summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnastasia Klimchuk <aklm@chromium.org>2021-04-28 10:08:15 +1000
committerNico Huber <nico.h@gmx.de>2021-04-28 15:12:08 +0000
commit04fff28b462483f60ca1aff1362f106021e793db (patch)
tree07f0acb4e214bc4ce0fa58d8f5827e163a8b40a9
parent45d50a101e8073191e6d88143990ed91d3bfe815 (diff)
downloadflashrom-04fff28b462483f60ca1aff1362f106021e793db.tar.gz
flashrom-04fff28b462483f60ca1aff1362f106021e793db.tar.bz2
flashrom-04fff28b462483f60ca1aff1362f106021e793db.zip
ene_lpc.c: Extract params check into a function
This allows char *p to become a local variable in check_params, and it is allocated and freed within check_params function. Which means init function does not need char *p anymore, in particular does not need to free it - and this makes cleanup after failed init easier. As a good side effect, init function becomes easier to read. BUG=b:185191942 TEST=builds Change-Id: I7c3b6dea0edbc7547f0b307a0508c7d2b2a6d370 Signed-off-by: Anastasia Klimchuk <aklm@chromium.org> Reviewed-on: https://review.coreboot.org/c/flashrom/+/52684 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Angel Pons <th3fanbus@gmail.com> Reviewed-by: Nico Huber <nico.h@gmx.de>
-rw-r--r--ene_lpc.c19
1 files changed, 14 insertions, 5 deletions
diff --git a/ene_lpc.c b/ene_lpc.c
index 1d045b841..c05fef83f 100644
--- a/ene_lpc.c
+++ b/ene_lpc.c
@@ -513,11 +513,23 @@ static struct spi_master spi_master_ene = {
.write_256 = default_spi_write_256,
};
+static int check_params(void)
+{
+ int ret = 0;
+ char *const p = extract_programmer_param("type");
+ if (p && strcmp(p, "ec")) {
+ msg_pdbg("ene_lpc only supports \"ec\" type devices\n");
+ ret = 1;
+ }
+
+ free(p);
+ return ret;
+}
+
int ene_lpc_init()
{
uint8_t hwver, ediid, i;
int ret = 0;
- char *p = NULL;
ene_lpc_data_t *ctx_data = NULL;
msg_pdbg("%s\n", __func__);
@@ -529,9 +541,7 @@ int ene_lpc_init()
}
ctx_data->ec_state = EC_STATE_NORMAL;
- p = extract_programmer_param("type");
- if (p && strcmp(p, "ec")) {
- msg_pdbg("ene_lpc only supports \"ec\" type devices\n");
+ if (check_params()) {
ret = 1;
goto ene_probe_spi_flash_exit;
}
@@ -572,7 +582,6 @@ int ene_lpc_init()
msg_pdbg("%s: successfully initialized ene\n", __func__);
ene_probe_spi_flash_exit:
- free(p);
if (ret)
free(ctx_data);
return ret;