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, 4 deletions

diff --git a/it85spi.c b/it85spi.c
index 4d0f98801..810f062c5 100644
--- a/it85spi.c
+++ b/it85spi.c
@@ -281,7 +281,7 @@ static int it85xx_spi_send_command(const struct flashctx *flash,
         return 0;
 }
 
-static struct spi_master spi_master_it85xx = {
+static const struct spi_master spi_master_it85xx = {
         .max_data_read  = 64,
         .max_data_write = 64,
         .command        = it85xx_spi_send_command,
@@ -358,15 +358,13 @@ int it85xx_spi_init(struct superio s)
 		return 1;
 	}
 
-	spi_master_it85xx.data = data;
-
 	/* FIXME: Really leave FWH enabled? We can't use this region
 	 * anymore since accessing it would mess up IT85 communication.
 	 * If we decide to disable FWH for this region, we should print
 	 * a debug message about it.
 	 */
 	/* Set this as SPI controller. */
-	register_spi_master(&spi_master_it85xx, NULL);
+	register_spi_master(&spi_master_it85xx, data);
 
 	return 0;
 }