From 5c710ea54afabf8c0e5f3c8ada45c4a5f9f0781b Mon Sep 17 00:00:00 2001 From: Edward O'Callaghan Date: Fri, 12 Aug 2022 13:47:29 +1000 Subject: tree: Port programmers to pass programmer_cfg to extractors Ran; ``` $ find -name '*.c' -exec sed -i 's/extract_programmer_param_str(NULL/extract_programmer_param_str(cfg/g' '{}' \; ``` Manually fix i2c_helper_linux.c and other cases after. Treat cases of; - pcidev.c , and - usb_device.c as exceptional to be dealt with in later patches. Change-Id: If7b7987e803d35582dda219652a6fc3ed5729b47 Signed-off-by: Edward O'Callaghan Reviewed-on: https://review.coreboot.org/c/flashrom/+/66656 Tested-by: build bot (Jenkins) Reviewed-by: Anastasia Klimchuk Reviewed-by: Felix Singer --- linux_spi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'linux_spi.c') diff --git a/linux_spi.c b/linux_spi.c index b54ab17a7..09ee8a0de 100644 --- a/linux_spi.c +++ b/linux_spi.c @@ -177,7 +177,7 @@ static int linux_spi_init(const struct programmer_cfg *cfg) size_t max_kernel_buf_size; struct linux_spi_data *spi_data; - param_str = extract_programmer_param_str(NULL, "spispeed"); + param_str = extract_programmer_param_str(cfg, "spispeed"); if (param_str && strlen(param_str)) { speed_hz = (uint32_t)strtoul(param_str, &endp, 10) * 1000; if (param_str == endp || speed_hz == 0) { @@ -192,7 +192,7 @@ static int linux_spi_init(const struct programmer_cfg *cfg) } free(param_str); - param_str = extract_programmer_param_str(NULL, "dev"); + param_str = extract_programmer_param_str(cfg, "dev"); if (!param_str || !strlen(param_str)) { msg_perr("No SPI device given. Use flashrom -p " "linux_spi:dev=/dev/spidevX.Y\n"); -- cgit v1.2.3