diff options
| author | Edward O'Callaghan <quasisec@google.com> | 2022-08-12 13:47:29 +1000 |
|---|---|---|
| committer | Anastasia Klimchuk <aklm@chromium.org> | 2022-09-07 01:56:58 +0000 |
| commit | 5c710ea54afabf8c0e5f3c8ada45c4a5f9f0781b (patch) | |
| tree | f320b3bb2deace62c899f5015dbe348321ad7aad /i2c_helper_linux.c | |
| parent | c3df94cb96dd0a6771926e2c6a1ed6309452de83 (diff) | |
| download | flashrom-5c710ea54afabf8c0e5f3c8ada45c4a5f9f0781b.tar.gz flashrom-5c710ea54afabf8c0e5f3c8ada45c4a5f9f0781b.tar.bz2 flashrom-5c710ea54afabf8c0e5f3c8ada45c4a5f9f0781b.zip | |
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 <quasisec@google.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/66656
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Anastasia Klimchuk <aklm@chromium.org>
Reviewed-by: Felix Singer <felixsinger@posteo.net>
Diffstat (limited to 'i2c_helper_linux.c')
| -rw-r--r-- | i2c_helper_linux.c | 6 |
1 files changed, 3 insertions, 3 deletions
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__); |