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 --- i2c_helper_linux.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'i2c_helper_linux.c') diff --git a/i2c_helper_linux.c b/i2c_helper_linux.c index 29fdfd413..19b4404fb 100644 --- a/i2c_helper_linux.c +++ b/i2c_helper_linux.c @@ -96,12 +96,12 @@ static int get_bus_number(char *bus_str) return bus; } -int i2c_open_from_programmer_params(uint16_t addr, int force) +int i2c_open_from_programmer_params(const struct programmer_cfg *cfg, uint16_t addr, int force) { int fd = -1; - char *bus_str = extract_programmer_param_str(NULL, "bus"); - char *device_path = extract_programmer_param_str(NULL, "devpath"); + char *bus_str = extract_programmer_param_str(cfg, "bus"); + char *device_path = extract_programmer_param_str(cfg, "devpath"); if (device_path != NULL && bus_str != NULL) { msg_perr("%s: only one of bus and devpath may be specified\n", __func__); -- cgit v1.2.3