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>

1 files changed, 2 insertions, 3 deletions

diff --git a/it87spi.c b/it87spi.c
index 0760ac864..92c95fa40 100644
--- a/it87spi.c
+++ b/it87spi.c
@@ -290,7 +290,7 @@ static int it8716f_spi_chip_write_256(struct flashctx *flash, const uint8_t *buf
 	return 0;
 }
 
-static struct spi_master spi_master_it87xx = {
+static const struct spi_master spi_master_it87xx = {
 	.max_data_read	= 3,
 	.max_data_write	= MAX_DATA_UNSPECIFIED,
 	.command	= it8716f_spi_send_command,
@@ -419,14 +419,13 @@ static uint16_t it87spi_probe(uint16_t port)
 
 	data->flashport = flashport;
 	data->fast_spi = 1;
-	spi_master_it87xx.data = data;
 
 	register_shutdown(it8716f_shutdown, data);
 
 	if (internal_buses_supported & BUS_SPI)
 		msg_pdbg("Overriding chipset SPI with IT87 SPI.\n");
 	/* FIXME: Add the SPI bus or replace the other buses with it? */
-	register_spi_master(&spi_master_it87xx, NULL);
+	register_spi_master(&spi_master_it87xx, data);
 	return 0;
 }