[flashrom-gerrit] Change in flashrom[master]: opaque_master: Move shutdown function above opaque_master struct

[Anastasia Klimchuk (Code Review)]

Anastasia Klimchuk has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/56824 )

Change subject: opaque_master: Move shutdown function above opaque_master struct
......................................................................

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 
---
M linux_mtd.c
M nicintel_eeprom.c
2 files changed, 25 insertions(+), 25 deletions(-)

git pull ssh://review.coreboot.org:29418/flashrom refs/changes/24/56824/1

diff --git a/linux_mtd.c b/linux_mtd.c
index 7780feb..42d569d 100644
--- a/linux_mtd.c
+++ b/linux_mtd.c
@@ -295,6 +295,17 @@
    return 0;
 }

+static int linux_mtd_shutdown(void *data)
+{
+	struct linux_mtd_data *mtd_data = data;
+	if (mtd_data->dev_fp != NULL) {
+		fclose(mtd_data->dev_fp);
+	}
+	free(data);
+
+	return 0;
+}
+
 static const struct opaque_master linux_mtd_opaque_master = {
    /* max_data_{read,write} don't have any effect for this programmer */
    .max_data_read	= MAX_DATA_UNSPECIFIED,
@@ -356,17 +367,6 @@
    return ret;
 }

-static int linux_mtd_shutdown(void *data)
-{
-	struct linux_mtd_data *mtd_data = data;
-	if (mtd_data->dev_fp != NULL) {
-		fclose(mtd_data->dev_fp);
-	}
-	free(data);
-
-	return 0;
-}
-
 static int linux_mtd_init(void)
 {
    char *param;
diff --git a/nicintel_eeprom.c b/nicintel_eeprom.c
index ec0f04e..fd90250 100644
--- a/nicintel_eeprom.c
+++ b/nicintel_eeprom.c
@@ -395,20 +395,6 @@
    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 @@
    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())