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 --- it87spi.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'it87spi.c') diff --git a/it87spi.c b/it87spi.c index cbf830bd..e5523285 100644 --- a/it87spi.c +++ b/it87spi.c @@ -290,6 +290,12 @@ static int it8716f_spi_chip_write_256(struct flashctx *flash, const uint8_t *buf return 0; } +static int it8716f_shutdown(void *data) +{ + free(data); + return 0; +} + static const struct spi_master spi_master_it87xx = { .max_data_read = 3, .max_data_write = MAX_DATA_UNSPECIFIED, @@ -300,13 +306,6 @@ static const struct spi_master spi_master_it87xx = { .write_aai = spi_chip_write_1, }; - -static int it8716f_shutdown(void *data) -{ - free(data); - return 0; -} - static uint16_t it87spi_probe(uint16_t port) { uint8_t tmp = 0; -- cgit v1.2.3