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 /pickit2_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 'pickit2_spi.c')
| -rw-r--r-- | pickit2_spi.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pickit2_spi.c b/pickit2_spi.c index 47316d05..9c423b96 100644 --- a/pickit2_spi.c +++ b/pickit2_spi.c @@ -340,7 +340,7 @@ static int parse_voltage(char *voltage) return millivolt; } -static struct spi_master spi_master_pickit2 = { +static const struct spi_master spi_master_pickit2 = { .max_data_read = 40, .max_data_write = 40, .command = pickit2_spi_send_command, @@ -477,7 +477,6 @@ int pickit2_spi_init(void) return 1; } pickit2_data->pickit2_handle = pickit2_handle; - spi_master_pickit2.data = pickit2_data; if (pickit2_get_firmware_version(pickit2_handle)) goto init_err_cleanup_exit; @@ -501,7 +500,7 @@ int pickit2_spi_init(void) if (register_shutdown(pickit2_shutdown, pickit2_data)) goto init_err_cleanup_exit; - register_spi_master(&spi_master_pickit2, NULL); + register_spi_master(&spi_master_pickit2, pickit2_data); return 0; |