From b261bec1eea70aa67966b7f3ed36d4ae61cc31e0 Mon Sep 17 00:00:00 2001 From: Anastasia Klimchuk Date: Tue, 3 Aug 2021 14:39:51 +1000 Subject: opaque_master: Move shutdown function above opaque_master struct This patch prepares opaque masters to use new API which allows to register shutdown function in opaque_master struct. See also later patch in this chain, where opaque 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: I5000cfceeba859a76177a17c1cb7d1c1e9fc03fe Signed-off-by: Anastasia Klimchuk Reviewed-on: https://review.coreboot.org/c/flashrom/+/56824 Tested-by: build bot (Jenkins) Reviewed-by: Edward O'Callaghan --- nicintel_eeprom.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'nicintel_eeprom.c') diff --git a/nicintel_eeprom.c b/nicintel_eeprom.c index ec0f04ef6..fd9025058 100644 --- a/nicintel_eeprom.c +++ b/nicintel_eeprom.c @@ -395,20 +395,6 @@ static int nicintel_ee_erase_82580(struct flashctx *flash, unsigned int addr, un return nicintel_ee_write_82580(flash, NULL, addr, len); } -static const struct opaque_master opaque_master_nicintel_ee_82580 = { - .probe = nicintel_ee_probe_82580, - .read = nicintel_ee_read, - .write = nicintel_ee_write_82580, - .erase = nicintel_ee_erase_82580, -}; - -static const struct opaque_master opaque_master_nicintel_ee_i210 = { - .probe = nicintel_ee_probe_i210, - .read = nicintel_ee_read, - .write = nicintel_ee_write_i210, - .erase = nicintel_ee_erase_i210, -}; - static int nicintel_ee_shutdown_i210(void *arg) { if (!done_i20_write) @@ -455,6 +441,20 @@ out: return ret; } +static const struct opaque_master opaque_master_nicintel_ee_82580 = { + .probe = nicintel_ee_probe_82580, + .read = nicintel_ee_read, + .write = nicintel_ee_write_82580, + .erase = nicintel_ee_erase_82580, +}; + +static const struct opaque_master opaque_master_nicintel_ee_i210 = { + .probe = nicintel_ee_probe_i210, + .read = nicintel_ee_read, + .write = nicintel_ee_write_i210, + .erase = nicintel_ee_erase_i210, +}; + static int nicintel_ee_init(void) { if (rget_io_perms()) -- cgit v1.2.3