diff options
| author | Nico Huber <nico.h@gmx.de> | 2021-05-11 17:53:34 +0200 |
|---|---|---|
| committer | Nico Huber <nico.h@gmx.de> | 2021-05-13 14:37:43 +0000 |
| commit | 90739d147f1d9b90789873fdbe74da6c616cad6b (patch) | |
| tree | 019d727f7b3289a0d71c831374e2f33c3ae1b66a /ft2232_spi.c | |
| parent | 7e4968525d37d87e8b6f8b848e4f2f9696926237 (diff) | |
| download | flashrom-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 'ft2232_spi.c')
| -rw-r--r-- | ft2232_spi.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/ft2232_spi.c b/ft2232_spi.c index 8d50d2041..6072cd26e 100644 --- a/ft2232_spi.c +++ b/ft2232_spi.c @@ -276,7 +276,7 @@ static int ft2232_spi_send_command(const struct flashctx *flash, return failed ? -1 : 0; } -static struct spi_master spi_master_ft2232 = { +static const struct spi_master spi_master_ft2232 = { .features = SPI_MASTER_4BA, .max_data_read = 64 * 1024, .max_data_write = 256, @@ -620,13 +620,11 @@ int ft2232_spi_init(void) spi_data->pindir = pindir; spi_data->ftdic_context = ftdic; - spi_master_ft2232.data = spi_data; - if (register_shutdown(ft2232_shutdown, spi_data)) { free(spi_data); goto ftdi_err; } - register_spi_master(&spi_master_ft2232, NULL); + register_spi_master(&spi_master_ft2232, spi_data); return 0; |