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 --- mstarddc_spi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mstarddc_spi.c') diff --git a/mstarddc_spi.c b/mstarddc_spi.c index 5b9e40e0..ee5779c2 100644 --- a/mstarddc_spi.c +++ b/mstarddc_spi.c @@ -159,7 +159,7 @@ static int mstarddc_spi_init(const struct programmer_cfg *cfg) struct mstarddc_spi_data *mstarddc_data; // Get device, address from command-line - char *i2c_device = extract_programmer_param_str(NULL, "dev"); + char *i2c_device = extract_programmer_param_str(cfg, "dev"); if (i2c_device != NULL && strlen(i2c_device) > 0) { char *i2c_address = strchr(i2c_device, ':'); if (i2c_address != NULL) { @@ -182,7 +182,7 @@ static int mstarddc_spi_init(const struct programmer_cfg *cfg) msg_pinfo("Info: Will try to use device %s and address 0x%02x.\n", i2c_device, mstarddc_addr); // Get noreset=1 option from command-line - char *noreset = extract_programmer_param_str(NULL, "noreset"); + char *noreset = extract_programmer_param_str(cfg, "noreset"); if (noreset != NULL && noreset[0] == '1') mstarddc_doreset = 0; free(noreset); -- cgit v1.2.3