From 90739d147f1d9b90789873fdbe74da6c616cad6b Mon Sep 17 00:00:00 2001 From: Nico Huber Date: Tue, 11 May 2021 17:53:34 +0200 Subject: 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 Reviewed-on: https://review.coreboot.org/c/flashrom/+/54067 Tested-by: build bot (Jenkins) Reviewed-by: Angel Pons --- digilent_spi.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'digilent_spi.c') diff --git a/digilent_spi.c b/digilent_spi.c index 5471724e..ee788901 100644 --- a/digilent_spi.c +++ b/digilent_spi.c @@ -315,7 +315,7 @@ static int digilent_spi_send_command(const struct flashctx *flash, unsigned int return 0; } -static struct spi_master spi_master_digilent_spi = { +static const struct spi_master spi_master_digilent_spi = { .features = SPI_MASTER_4BA, .max_data_read = 252, .max_data_write = 252, @@ -454,10 +454,9 @@ int digilent_spi_init(void) } digilent_data->reset_board = reset_board; digilent_data->handle = handle; - spi_master_digilent_spi.data = digilent_data; register_shutdown(digilent_spi_shutdown, digilent_data); - register_spi_master(&spi_master_digilent_spi, NULL); + register_spi_master(&spi_master_digilent_spi, digilent_data); return 0; -- cgit v1.2.3