aboutsummaryrefslogtreecommitdiffstats
path: root/atavia.c
diff options
context:
space:
mode:
authorEdward O'Callaghan <quasisec@google.com>2022-10-17 12:31:59 +1100
committerEdward O'Callaghan <quasisec@chromium.org>2022-12-12 00:02:26 +0000
commit1e01eefcba573c436d55b863c7972b3029564215 (patch)
treeaa8850783eb557f4921020e8171fbd7c3ea1ade3 /atavia.c
parent78e421bdf73d5739daa25a9f71b2c323dc98e840 (diff)
downloadflashrom-1e01eefcba573c436d55b863c7972b3029564215.tar.gz
flashrom-1e01eefcba573c436d55b863c7972b3029564215.tar.bz2
flashrom-1e01eefcba573c436d55b863c7972b3029564215.zip
tree/: Replace NULL-case of programmer_delay() with internal_delay
Replace `programmer_delay(NULL, [..])` calls with direct `internal_delay([..])` dispatches explicitly. Custom driver delays remain hooked as well as core flashrom logic. The NULL base case of 'programmer_delay()' then becomes a condition to validate for layering violations or invalid flash contexts. Change-Id: I1da230804d5e8f47a6e281feb66f381514dc6861 Signed-off-by: Edward O'Callaghan <quasisec@google.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/68434 Reviewed-by: Anastasia Klimchuk <aklm@chromium.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'atavia.c')
-rw-r--r--atavia.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/atavia.c b/atavia.c
index 1eebc970..ebf29493 100644
--- a/atavia.c
+++ b/atavia.c
@@ -90,7 +90,7 @@ static bool atavia_ready(struct pci_dev *pcidev_dev)
ready = true;
break;
} else {
- programmer_delay(NULL, 1);
+ internal_delay(1);
continue;
}
}
@@ -170,7 +170,7 @@ static int atavia_init(const struct programmer_cfg *cfg)
/* Test if a flash chip is attached. */
pci_write_long(dev, PCI_ROM_ADDRESS, (uint32_t)PCI_ROM_ADDRESS_MASK);
- programmer_delay(NULL, 90);
+ internal_delay(90);
uint32_t base = pci_read_long(dev, PCI_ROM_ADDRESS);
msg_pdbg2("BROM base=0x%08x\n", base);
if ((base & PCI_ROM_ADDRESS_MASK) == 0) {