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 --- linux_spi.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'linux_spi.c') diff --git a/linux_spi.c b/linux_spi.c index 82741bf60..7d866f477 100644 --- a/linux_spi.c +++ b/linux_spi.c @@ -113,7 +113,7 @@ static int linux_spi_send_command(const struct flashctx *flash, unsigned int wri return 0; } -static struct spi_master spi_master_linux = { +static const struct spi_master spi_master_linux = { .features = SPI_MASTER_4BA, .max_data_read = MAX_DATA_UNSPECIFIED, /* TODO? */ .max_data_write = MAX_DATA_UNSPECIFIED, /* TODO? */ @@ -238,13 +238,12 @@ int linux_spi_init(void) } spi_data->fd = fd; spi_data->max_kernel_buf_size = max_kernel_buf_size; - spi_master_linux.data = spi_data; if (register_shutdown(linux_spi_shutdown, spi_data)) { free(spi_data); goto init_err; } - register_spi_master(&spi_master_linux, NULL); + register_spi_master(&spi_master_linux, spi_data); return 0; init_err: -- cgit v1.2.3