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 /jlink_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 'jlink_spi.c')
| -rw-r--r-- | jlink_spi.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/jlink_spi.c b/jlink_spi.c index 9fe44a50..6342e7fc 100644 --- a/jlink_spi.c +++ b/jlink_spi.c @@ -155,7 +155,7 @@ static int jlink_spi_send_command(const struct flashctx *flash, unsigned int wri return 0; } -static struct spi_master spi_master_jlink_spi = { +static const struct spi_master spi_master_jlink_spi = { /* Maximum data read size in one go (excluding opcode+address). */ .max_data_read = JTAG_MAX_TRANSFER_SIZE - 5, /* Maximum data write size in one go (excluding opcode+address). */ @@ -464,7 +464,6 @@ int jlink_spi_init(void) jlink_data->ctx = jaylink_ctx; jlink_data->devh = jaylink_devh; jlink_data->reset_cs = reset_cs; - spi_master_jlink_spi.data = jlink_data; /* Ensure that the CS signal is not active initially. */ if (!deassert_cs(jlink_data)) @@ -472,7 +471,7 @@ int jlink_spi_init(void) if (register_shutdown(jlink_spi_shutdown, jlink_data)) goto init_err; - register_spi_master(&spi_master_jlink_spi, NULL); + register_spi_master(&spi_master_jlink_spi, jlink_data); return 0; |