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.
flashrom-stable: Updated `dirtyjtag_spi` and `dediprog`
that were added/refactored earlier.
Change-Id: Id7821f1db3284b7b5b3d0abfd878b979c53870a1
Signed-off-by: Nico Huber <nico.h@gmx.de>
Original-Reviewed-on: https://review.coreboot.org/c/flashrom/+/54067
Original-Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/flashrom-stable/+/72200
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
diff --git a/ft2232_spi.c b/ft2232_spi.c
index 2737dae..b37a60e 100644
--- a/ft2232_spi.c
+++ b/ft2232_spi.c
@@ -289,7 +289,7 @@
return ret ? -1 : 0;
}
-static struct spi_master spi_master_ft2232 = {
+static const struct spi_master spi_master_ft2232 = {
.features = SPI_MASTER_4BA,
.max_data_read = 64 * 1024,
.max_data_write = 256,
@@ -695,13 +695,12 @@
spi_data->cs_bits = cs_bits;
spi_data->aux_bits = aux_bits;
spi_data->pindir = pindir;
- spi_master_ft2232.data = spi_data;
if (register_shutdown(ft2232_shutdown, spi_data)) {
ret = -9;
goto ftdi_err;
}
- register_spi_master(&spi_master_ft2232, NULL);
+ register_spi_master(&spi_master_ft2232, spi_data);
return 0;