diff options
author | Nico Huber <nico.h@gmx.de> | 2021-05-11 17:53:34 +0200 |
---|---|---|
committer | Nico Huber <nico.h@gmx.de> | 2021-05-13 14:37:43 +0000 |
commit | 90739d147f1d9b90789873fdbe74da6c616cad6b (patch) | |
tree | 019d727f7b3289a0d71c831374e2f33c3ae1b66a /dummyflasher.c | |
parent | 7e4968525d37d87e8b6f8b848e4f2f9696926237 (diff) | |
download | flashrom-90739d147f1d9b90789873fdbe74da6c616cad6b.tar.gz flashrom-90739d147f1d9b90789873fdbe74da6c616cad6b.tar.bz2 flashrom-90739d147f1d9b90789873fdbe74da6c616cad6b.zip |
programmer: Make use of new register_spi_master() API
Pass pointers to dynamically allocated data to register_spi_master().
This way we can avoid some mutable globals.
Change-Id: Id7821f1db3284b7b5b3d0abfd878b979c53870a1
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/54067
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Diffstat (limited to 'dummyflasher.c')
-rw-r--r-- | dummyflasher.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/dummyflasher.c b/dummyflasher.c index 74075f4ea..d434eec34 100644 --- a/dummyflasher.c +++ b/dummyflasher.c @@ -611,7 +611,7 @@ static int dummy_spi_send_command(const struct flashctx *flash, unsigned int wri -static struct spi_master spi_master_dummyflasher = { +static const struct spi_master spi_master_dummyflasher = { .features = SPI_MASTER_4BA, .max_data_read = MAX_DATA_READ_UNLIMITED, .max_data_write = MAX_DATA_UNSPECIFIED, @@ -674,7 +674,6 @@ int dummy_init(void) } data->emu_chip = EMULATE_NONE; data->delay_us = 0; - spi_master_dummyflasher.data = data; par_master_dummy.data = data; msg_pspew("%s\n", __func__); @@ -1030,7 +1029,7 @@ dummy_init_out: register_par_master(&par_master_dummy, dummy_buses_supported & (BUS_PARALLEL | BUS_LPC | BUS_FWH)); if (dummy_buses_supported & BUS_SPI) - register_spi_master(&spi_master_dummyflasher, NULL); + register_spi_master(&spi_master_dummyflasher, data); return 0; } |