summaryrefslogtreecommitdiffstats
path: root/lspcon_i2c_spi.c
diff options
context:
space:
mode:
authorNico Huber <nico.h@gmx.de>2021-05-11 17:53:34 +0200
committerNico Huber <nico.h@gmx.de>2021-05-13 14:37:43 +0000
commit90739d147f1d9b90789873fdbe74da6c616cad6b (patch)
tree019d727f7b3289a0d71c831374e2f33c3ae1b66a /lspcon_i2c_spi.c
parent7e4968525d37d87e8b6f8b848e4f2f9696926237 (diff)
downloadflashrom-90739d147f1d9b90789873fdbe74da6c616cad6b.tar.gz
flashrom-90739d147f1d9b90789873fdbe74da6c616cad6b.tar.bz2
flashrom-90739d147f1d9b90789873fdbe74da6c616cad6b.zip
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>
Diffstat (limited to 'lspcon_i2c_spi.c')
-rw-r--r--lspcon_i2c_spi.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/lspcon_i2c_spi.c b/lspcon_i2c_spi.c
index 6b8dfe661..7f5e3efda 100644
--- a/lspcon_i2c_spi.c
+++ b/lspcon_i2c_spi.c
@@ -408,7 +408,7 @@ static int lspcon_i2c_spi_write_aai(struct flashctx *flash, const uint8_t *buf,
return SPI_GENERIC_ERROR;
}
-static struct spi_master spi_master_i2c_lspcon = {
+static const struct spi_master spi_master_i2c_lspcon = {
.max_data_read = 16,
.max_data_write = 12,
.command = lspcon_i2c_spi_send_command,
@@ -454,10 +454,9 @@ int lspcon_i2c_spi_init(void)
}
data->fd = fd;
- spi_master_i2c_lspcon.data = data;
ret |= register_shutdown(lspcon_i2c_spi_shutdown, data);
- ret |= register_spi_master(&spi_master_i2c_lspcon, NULL);
+ ret |= register_spi_master(&spi_master_i2c_lspcon, data);
return ret;
}