From 0a7f036610673f6664c9d1492912abfdfbdf9f20 Mon Sep 17 00:00:00 2001 From: Anastasia Klimchuk Date: Tue, 6 Jul 2021 16:03:11 +1000 Subject: spi_master: Move shutdown function above spi_master struct This patch prepares spi masters to use new API which allows to register shutdown function in spi_master struct. See also later patch in this chain, where spi masters are converted to new API. BUG=b:185191942 TEST=builds and ninja test Comparing flashrom binary before and after the patch, make clean && make CONFIG_EVERYTHING=yes VERSION=none binary is the same Change-Id: I50716686552b4ddcc6089d5afadb19ef59d9f9b4 Signed-off-by: Anastasia Klimchuk Reviewed-on: https://review.coreboot.org/c/flashrom/+/56101 Tested-by: build bot (Jenkins) Reviewed-by: Edward O'Callaghan Reviewed-by: Nico Huber --- digilent_spi.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'digilent_spi.c') diff --git a/digilent_spi.c b/digilent_spi.c index 8a3699d9..0ec402e9 100644 --- a/digilent_spi.c +++ b/digilent_spi.c @@ -315,18 +315,6 @@ static int digilent_spi_send_command(const struct flashctx *flash, unsigned int return 0; } -static const struct spi_master spi_master_digilent_spi = { - .features = SPI_MASTER_4BA, - .max_data_read = 252, - .max_data_write = 252, - .command = digilent_spi_send_command, - .multicommand = default_spi_send_multicommand, - .read = default_spi_read, - .write_256 = default_spi_write_256, - .write_aai = default_spi_write_aai, -}; - - static int digilent_spi_shutdown(void *data) { struct digilent_spi_data *digilent_data = data; @@ -340,6 +328,17 @@ static int digilent_spi_shutdown(void *data) return 0; } +static const struct spi_master spi_master_digilent_spi = { + .features = SPI_MASTER_4BA, + .max_data_read = 252, + .max_data_write = 252, + .command = digilent_spi_send_command, + .multicommand = default_spi_send_multicommand, + .read = default_spi_read, + .write_256 = default_spi_write_256, + .write_aai = default_spi_write_aai, +}; + static bool default_reset(struct libusb_device_handle *handle) { char board[17]; -- cgit v1.2.3