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 --- sb600spi.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'sb600spi.c') diff --git a/sb600spi.c b/sb600spi.c index c4b25e527..5c6547548 100644 --- a/sb600spi.c +++ b/sb600spi.c @@ -570,6 +570,17 @@ static int promontory_read_memmapped(struct flashctx *flash, uint8_t *buf, return 0; } +static int sb600spi_shutdown(void *data) +{ + struct sb600spi_data *sb600_data = data; + struct flashctx *flash = sb600_data->flash; + if (flash) + finalize_flash_access(flash); + + free(data); + return 0; +} + static const struct spi_master spi_master_sb600 = { .max_data_read = FIFO_SIZE_OLD, .max_data_write = FIFO_SIZE_OLD - 3, @@ -600,17 +611,6 @@ static const struct spi_master spi_master_promontory = { .write_aai = default_spi_write_aai, }; -static int sb600spi_shutdown(void *data) -{ - struct sb600spi_data *sb600_data = data; - struct flashctx *flash = sb600_data->flash; - if (flash) - finalize_flash_access(flash); - - free(data); - return 0; -} - int sb600_probe_spi(struct pci_dev *dev) { struct pci_dev *smbus_dev; -- cgit v1.2.3