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 /usbblaster_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 'usbblaster_spi.c')
| -rw-r--r-- | usbblaster_spi.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/usbblaster_spi.c b/usbblaster_spi.c index b652a3d5..115876e8 100644 --- a/usbblaster_spi.c +++ b/usbblaster_spi.c @@ -168,7 +168,7 @@ static int usbblaster_shutdown(void *data) return 0; } -static struct spi_master spi_master_usbblaster = { +static const struct spi_master spi_master_usbblaster = { .max_data_read = 256, .max_data_write = 256, .command = usbblaster_spi_send_command, @@ -226,13 +226,12 @@ int usbblaster_spi_init(void) return -1; } usbblaster_data->ftdic = ftdic; - spi_master_usbblaster.data = usbblaster_data; if (register_shutdown(usbblaster_shutdown, usbblaster_data)) { free(usbblaster_data); return -1; } - register_spi_master(&spi_master_usbblaster, NULL); + register_spi_master(&spi_master_usbblaster, usbblaster_data); return 0; } |