openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-27 23:22:37 +02:00
Code Issues Releases Wiki Activity

par_master: Move shutdown function above par_master struct

Browse Source 
This patch prepares par masters to use new API which allows to
register shutdown function in par_master struct. See also later
patch in this chain, where par 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: I87e9ce0ad9b39b39645dc24cb0d75d1e7a6d9047
Signed-off-by: Anastasia Klimchuk <aklm@chromium.org>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/57155
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-26 10:30:16 +10:00 committed by Edward O'Callaghan
parent d1697e9abe
commit d681ab286a
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
nic3com.c
View File

@ -73,17 +73,6 @@ static uint8_t nic3com_chip_readb(const struct flashctx *flash,
return INB(data->io_base_addr + BIOS_ROM_DATA); return INB(data->io_base_addr + BIOS_ROM_DATA);
} }
static const struct par_master par_master_nic3com = {
.chip_readb = nic3com_chip_readb,
.chip_readw = fallback_chip_readw,
.chip_readl = fallback_chip_readl,
.chip_readn = fallback_chip_readn,
.chip_writeb = nic3com_chip_writeb,
.chip_writew = fallback_chip_writew,
.chip_writel = fallback_chip_writel,
.chip_writen = fallback_chip_writen,
};
static int nic3com_shutdown(void *par_data) static int nic3com_shutdown(void *par_data)
{ {
struct nic3com_data *data = par_data; struct nic3com_data *data = par_data;
@ -101,6 +90,17 @@ static int nic3com_shutdown(void *par_data)
return 0; return 0;
} }
static const struct par_master par_master_nic3com = {
.chip_readb = nic3com_chip_readb,
.chip_readw = fallback_chip_readw,
.chip_readl = fallback_chip_readl,
.chip_readn = fallback_chip_readn,
.chip_writeb = nic3com_chip_writeb,
.chip_writew = fallback_chip_writew,
.chip_writel = fallback_chip_writel,
.chip_writen = fallback_chip_writen,
};
static int nic3com_init(void) static int nic3com_init(void)
{ {
struct pci_dev *dev = NULL; struct pci_dev *dev = NULL;

14
nicrealtek.c
View File

@ -79,6 +79,13 @@ static uint8_t nicrealtek_chip_readb(const struct flashctx *flash, const chipadd
return val; return val;
} }
static int nicrealtek_shutdown(void *data)
{
/* FIXME: We forgot to disable software access again. */
free(data);
return 0;
}
static const struct par_master par_master_nicrealtek = { static const struct par_master par_master_nicrealtek = {
.chip_readb = nicrealtek_chip_readb, .chip_readb = nicrealtek_chip_readb,
.chip_readw = fallback_chip_readw, .chip_readw = fallback_chip_readw,
@ -90,13 +97,6 @@ static const struct par_master par_master_nicrealtek = {
.chip_writen = fallback_chip_writen, .chip_writen = fallback_chip_writen,
}; };
static int nicrealtek_shutdown(void *data)
{
/* FIXME: We forgot to disable software access again. */
free(data);
return 0;
}
static int nicrealtek_init(void) static int nicrealtek_init(void)
{ {
struct pci_dev *dev = NULL; struct pci_dev *dev = NULL;