From 4b503bee39e8761d7c4ff910562448c488da2b7e Mon Sep 17 00:00:00 2001 From: Edward O'Callaghan Date: Wed, 7 Sep 2022 10:47:45 +1000 Subject: drivers/: Make 'internal_delay' the default unless defined Drop the explicit need to specify the default 'internal_delay' callback function pointer in the programmer_entry struct. This is a reasonable default for every other driver in the tree with only the two exceptions of ch341a_spi.c and serprog.c. Thus this simplifies driver development. Change-Id: I17460bc2c0aebcbb48c8dfa052b260991525cc49 Signed-off-by: Edward O'Callaghan Reviewed-on: https://review.coreboot.org/c/flashrom/+/67391 Reviewed-by: Peter Marheine Reviewed-by: Angel Pons Reviewed-by: Thomas Heijligen Reviewed-by: Felix Singer Reviewed-by: Nikolai Artemiev Tested-by: build bot (Jenkins) --- flashrom.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'flashrom.c') diff --git a/flashrom.c b/flashrom.c index 26045943..3328a716 100644 --- a/flashrom.c +++ b/flashrom.c @@ -219,8 +219,12 @@ void programmer_unmap_flash_region(void *virt_addr, size_t len) void programmer_delay(unsigned int usecs) { - if (usecs > 0) - programmer->delay(usecs); + if (usecs > 0) { + if (programmer->delay) + programmer->delay(usecs); + else + internal_delay(usecs); + } } int read_memmapped(struct flashctx *flash, uint8_t *buf, unsigned int start, @@ -1419,10 +1423,6 @@ int selfcheck(void) msg_gerr("Programmer %s does not have a valid init function!\n", p->name); ret = 1; } - if (p->delay == NULL) { - msg_gerr("Programmer %s does not have a valid delay function!\n", p->name); - ret = 1; - } if (p->map_flash_region == NULL) { msg_gerr("Programmer %s does not have a valid map_flash_region function!\n", p->name); ret = 1; -- cgit v1.2.3