openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-07-02 06:23:18 +02:00
Code Issues Releases Wiki Activity

opaque_master: Move shutdown function above opaque_master struct

Browse Source 
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 <aklm@chromium.org>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/56824
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
This commit is contained in:
Anastasia Klimchuk
2021-08-03 14:39:51 +10:00
committed by Nico Huber
parent c845e64b4f
commit b261bec1ee
2 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
linux_mtd.c
View File

@ -295,6 +295,17 @@ static int linux_mtd_erase(struct flashctx *flash,
return 0; 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 = { static const struct opaque_master linux_mtd_opaque_master = {
/* max_data_{read,write} don't have any effect for this programmer */ /* max_data_{read,write} don't have any effect for this programmer */
.max_data_read = MAX_DATA_UNSPECIFIED, .max_data_read = MAX_DATA_UNSPECIFIED,
@ -356,17 +367,6 @@ linux_mtd_setup_exit:
return ret; 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) static int linux_mtd_init(void)
{ {
char *param; char *param;

28
nicintel_eeprom.c
View File

@ -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); 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) static int nicintel_ee_shutdown_i210(void *arg)
{ {
if (!done_i20_write) if (!done_i20_write)
@ -455,6 +441,20 @@ out:
return ret; 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) static int nicintel_ee_init(void)
{ {
if (rget_io_perms()) if (rget_io_perms())