Edward O'Callaghan submitted this change.
par_master: Move shutdown function above par_master struct
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>
---
M nic3com.c
M nicrealtek.c
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/nic3com.c b/nic3com.c
index 14108f0..dd3d0cb 100644
--- a/nic3com.c
+++ b/nic3com.c
@@ -73,17 +73,6 @@
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)
{
struct nic3com_data *data = par_data;
@@ -101,6 +90,17 @@
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)
{
struct pci_dev *dev = NULL;
diff --git a/nicrealtek.c b/nicrealtek.c
index 81d305b..b8125f4 100644
--- a/nicrealtek.c
+++ b/nicrealtek.c
@@ -79,6 +79,13 @@
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 = {
.chip_readb = nicrealtek_chip_readb,
.chip_readw = fallback_chip_readw,
@@ -90,13 +97,6 @@
.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)
{
struct pci_dev *dev = NULL;
To view, visit change 57155. To unsubscribe, or for help writing mail filters, visit settings.