From c49aaeef777fd66381100b4b6f133289755aa831 Mon Sep 17 00:00:00 2001 From: Anastasia Klimchuk Date: Fri, 21 May 2021 09:45:53 +1000 Subject: programmer: Make use of new register_par_master() API Pass pointers to dynamically allocated data to register_par_master(). This way we can avoid a mutable global. BUG=b:185191942 TEST=builds Change-Id: I76572e43d01f8a5e1aa73b1b9e8a187465ed8fef Signed-off-by: Anastasia Klimchuk Reviewed-on: https://review.coreboot.org/c/flashrom/+/54172 Tested-by: build bot (Jenkins) Reviewed-by: Edward O'Callaghan --- dummyflasher.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'dummyflasher.c') diff --git a/dummyflasher.c b/dummyflasher.c index c1c393c7..d5496079 100644 --- a/dummyflasher.c +++ b/dummyflasher.c @@ -622,7 +622,7 @@ static const struct spi_master spi_master_dummyflasher = { .write_aai = default_spi_write_aai, }; -static struct par_master par_master_dummy = { +static const struct par_master par_master_dummy = { .chip_readb = dummy_chip_readb, .chip_readw = dummy_chip_readw, .chip_readl = dummy_chip_readl, @@ -674,7 +674,6 @@ int dummy_init(void) } data->emu_chip = EMULATE_NONE; data->delay_us = 0; - par_master_dummy.data = data; msg_pspew("%s\n", __func__); @@ -1028,7 +1027,7 @@ dummy_init_out: if (dummy_buses_supported & BUS_NONSPI) register_par_master(&par_master_dummy, dummy_buses_supported & BUS_NONSPI, - NULL); + data); if (dummy_buses_supported & BUS_SPI) register_spi_master(&spi_master_dummyflasher, data); -- cgit v1.2.3