From 1e01eefcba573c436d55b863c7972b3029564215 Mon Sep 17 00:00:00 2001 From: Edward O'Callaghan Date: Mon, 17 Oct 2022 12:31:59 +1100 Subject: 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 Reviewed-on: https://review.coreboot.org/c/flashrom/+/68434 Reviewed-by: Anastasia Klimchuk Tested-by: build bot (Jenkins) --- atavia.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'atavia.c') 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) { -- cgit v1.2.3