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 <quasisec@google.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/67391
Reviewed-by: Peter Marheine <pmarheine@chromium.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Thomas Heijligen <src@posteo.de>
Reviewed-by: Felix Singer <felixsinger@posteo.net>
Reviewed-by: Nikolai Artemiev <nartemiev@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

37 files changed, 6 insertions, 42 deletions

diff --git a/atahpt.c b/atahpt.c
index 5c636d1b..fa69137e 100644
--- a/atahpt.c
+++ b/atahpt.c
@@ -122,5 +122,4 @@ const struct programmer_entry programmer_atahpt = {
 	.init			= atahpt_init,
 	.map_flash_region	= fallback_map,
 	.unmap_flash_region	= fallback_unmap,
-	.delay			= internal_delay,
 };
diff --git a/atapromise.c b/atapromise.c
index d4a3aa84..5de0921e 100644
--- a/atapromise.c
+++ b/atapromise.c
@@ -186,5 +186,4 @@ const struct programmer_entry programmer_atapromise = {
 	.init			= atapromise_init,
 	.map_flash_region	= fallback_map,
 	.unmap_flash_region	= fallback_unmap,
-	.delay			= internal_delay,
 };
diff --git a/atavia.c b/atavia.c
index 51530a47..a0be396f 100644
--- a/atavia.c
+++ b/atavia.c
@@ -191,5 +191,4 @@ const struct programmer_entry programmer_atavia = {
 	.init			= atavia_init,
 	.map_flash_region	= atavia_map,
 	.unmap_flash_region	= fallback_unmap,
-	.delay			= internal_delay,
 };
diff --git a/buspirate_spi.c b/buspirate_spi.c
index 0704887f..121c7e50 100644
--- a/buspirate_spi.c
+++ b/buspirate_spi.c
@@ -716,5 +716,4 @@ const struct programmer_entry programmer_buspirate_spi = {
 	.init			= buspirate_spi_init,
 	.map_flash_region	= fallback_map,
 	.unmap_flash_region	= fallback_unmap,
-	.delay			= internal_delay,
 };
diff --git a/dediprog.c b/dediprog.c
index f957be6d..99c91e02 100644
--- a/dediprog.c
+++ b/dediprog.c
@@ -1321,5 +1321,4 @@ const struct programmer_entry programmer_dediprog = {
 	.init			= dediprog_init,
 	.map_flash_region	= fallback_map,
 	.unmap_flash_region	= fallback_unmap,
-	.delay			= internal_delay,
 };
diff --git a/developerbox_spi.c b/developerbox_spi.c
index 3774d047..04957a3c 100644
--- a/developerbox_spi.c
+++ b/developerbox_spi.c
@@ -195,5 +195,4 @@ const struct programmer_entry programmer_developerbox = {
 	.init			= developerbox_spi_init,
 	.map_flash_region	= fallback_map,
 	.unmap_flash_region	= fallback_unmap,
-	.delay			= internal_delay,
 };
diff --git a/digilent_spi.c b/digilent_spi.c
index 41342a85..85f3884f 100644
--- a/digilent_spi.c
+++ b/digilent_spi.c
@@ -470,5 +470,4 @@ const struct programmer_entry programmer_digilent_spi = {
 	.init			= digilent_spi_init,
 	.map_flash_region	= fallback_map,
 	.unmap_flash_region	= fallback_unmap,
-	.delay			= internal_delay,
 };
diff --git a/drkaiser.c b/drkaiser.c
index b121eec0..039e6866 100644
--- a/drkaiser.c
+++ b/drkaiser.c
@@ -124,5 +124,4 @@ const struct programmer_entry programmer_drkaiser = {
 	.init			= drkaiser_init,
 	.map_flash_region	= fallback_map,
 	.unmap_flash_region	= fallback_unmap,
-	.delay			= internal_delay,
 };
diff --git a/dummyflasher.c b/dummyflasher.c
index 49a541b7..b2a41c6e 100644
--- a/dummyflasher.c
+++ b/dummyflasher.c
@@ -1426,5 +1426,4 @@ const struct programmer_entry programmer_dummy = {
 	.init			= dummy_init,
 	.map_flash_region	= dummy_map,
 	.unmap_flash_region	= dummy_unmap,
-	.delay			= internal_delay,
 };
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;
diff --git a/ft2232_spi.c b/ft2232_spi.c
index 5b45d7ed..6d7aa6a1 100644
--- a/ft2232_spi.c
+++ b/ft2232_spi.c
@@ -713,5 +713,4 @@ const struct programmer_entry programmer_ft2232_spi = {
 	.init			= ft2232_spi_init,
 	.map_flash_region	= fallback_map,
 	.unmap_flash_region	= fallback_unmap,
-	.delay			= internal_delay,
 };
diff --git a/gfxnvidia.c b/gfxnvidia.c
index ff510ef4..cab408c6 100644
--- a/gfxnvidia.c
+++ b/gfxnvidia.c
@@ -152,5 +152,4 @@ const struct programmer_entry programmer_gfxnvidia = {
 	.init			= gfxnvidia_init,
 	.map_flash_region	= fallback_map,
 	.unmap_flash_region	= fallback_unmap,
-	.delay			= internal_delay,
 };
diff --git a/internal.c b/internal.c
index 6a8db5e6..2558cdef 100644
--- a/internal.c
+++ b/internal.c
@@ -349,5 +349,4 @@ const struct programmer_entry programmer_internal = {
 	.init			= internal_init,
 	.map_flash_region	= physmap,
 	.unmap_flash_region	= physunmap,
-	.delay			= internal_delay,
 };
diff --git a/it8212.c b/it8212.c
index 18d1173b..9b4a2638 100644
--- a/it8212.c
+++ b/it8212.c
@@ -113,5 +113,4 @@ const struct programmer_entry programmer_it8212 = {
 	.init			= it8212_init,
 	.map_flash_region	= fallback_map,
 	.unmap_flash_region	= fallback_unmap,
-	.delay			= internal_delay,
 };
diff --git a/jlink_spi.c b/jlink_spi.c
index 52fc7862..ef4d9ca0 100644
--- a/jlink_spi.c
+++ b/jlink_spi.c
@@ -538,5 +538,4 @@ const struct programmer_entry programmer_jlink_spi = {
 	.devs.note		= "SEGGER J-Link and compatible devices\n",
 	.map_flash_region	= fallback_map,
 	.unmap_flash_region	= fallback_unmap,
-	.delay			= internal_delay,
 };
diff --git a/linux_mtd.c b/linux_mtd.c
index c0147f68..26244a84 100644
--- a/linux_mtd.c
+++ b/linux_mtd.c
@@ -559,5 +559,4 @@ const struct programmer_entry programmer_linux_mtd = {
 	.init			= linux_mtd_init,
 	.map_flash_region	= fallback_map,
 	.unmap_flash_region	= fallback_unmap,
-	.delay			= internal_delay,
 };
diff --git a/linux_spi.c b/linux_spi.c
index 09ee8a0d..b51d9e98 100644
--- a/linux_spi.c
+++ b/linux_spi.c
@@ -253,5 +253,4 @@ const struct programmer_entry programmer_linux_spi = {
 	.init			= linux_spi_init,
 	.map_flash_region	= fallback_map,
 	.unmap_flash_region	= fallback_unmap,
-	.delay			= internal_delay,
 };
diff --git a/mediatek_i2c_spi.c b/mediatek_i2c_spi.c
index 39a9cea9..727f9334 100644
--- a/mediatek_i2c_spi.c
+++ b/mediatek_i2c_spi.c
@@ -544,5 +544,4 @@ const struct programmer_entry programmer_mediatek_i2c_spi = {
 	.init			= mediatek_init,
 	.map_flash_region	= fallback_map,
 	.unmap_flash_region	= fallback_unmap,
-	.delay			= internal_delay,
 };
diff --git a/mstarddc_spi.c b/mstarddc_spi.c
index af46b244..88a4afaf 100644
--- a/mstarddc_spi.c
+++ b/mstarddc_spi.c
@@ -257,5 +257,4 @@ const struct programmer_entry programmer_mstarddc_spi = {
 	.init			= mstarddc_spi_init,
 	.map_flash_region	= fallback_map,
 	.unmap_flash_region	= fallback_unmap,
-	.delay			= internal_delay,
 };
diff --git a/ni845x_spi.c b/ni845x_spi.c
index 3d74fd9e..b5cfc06b 100644
--- a/ni845x_spi.c
+++ b/ni845x_spi.c
@@ -637,5 +637,4 @@ const struct programmer_entry programmer_ni845x_spi = {
 	.init			= ni845x_spi_init,
 	.map_flash_region	= fallback_map,
 	.unmap_flash_region	= fallback_unmap,
-	.delay			= internal_delay,
 };
diff --git a/nic3com.c b/nic3com.c
index 44710edb..8fafef95 100644
--- a/nic3com.c
+++ b/nic3com.c
@@ -170,5 +170,4 @@ const struct programmer_entry programmer_nic3com = {
 	.init			= nic3com_init,
 	.map_flash_region	= fallback_map,
 	.unmap_flash_region	= fallback_unmap,
-	.delay			= internal_delay,
 };
diff --git a/nicintel.c b/nicintel.c
index 16cb5e45..fa91ff1a 100644
--- a/nicintel.c
+++ b/nicintel.c
@@ -135,5 +135,4 @@ const struct programmer_entry programmer_nicintel = {
 	.init			= nicintel_init,
 	.map_flash_region	= fallback_map,
 	.unmap_flash_region	= fallback_unmap,
-	.delay			= internal_delay,
 };
diff --git a/nicintel_eeprom.c b/nicintel_eeprom.c
index 4d3e7d58..01f90756 100644
--- a/nicintel_eeprom.c
+++ b/nicintel_eeprom.c
@@ -540,5 +540,4 @@ const struct programmer_entry programmer_nicintel_eeprom = {
 	.init			= nicintel_ee_init,
 	.map_flash_region	= fallback_map,
 	.unmap_flash_region	= fallback_unmap,
-	.delay			= internal_delay,
 };
diff --git a/nicintel_spi.c b/nicintel_spi.c
index 851b5258..b99da53b 100644
--- a/nicintel_spi.c
+++ b/nicintel_spi.c
@@ -339,5 +339,4 @@ const struct programmer_entry programmer_nicintel_spi = {
 	.init			= nicintel_spi_init,
 	.map_flash_region	= fallback_map,
 	.unmap_flash_region	= fallback_unmap,
-	.delay			= internal_delay,
 };
diff --git a/nicnatsemi.c b/nicnatsemi.c
index 779fb33d..7236d4d6 100644
--- a/nicnatsemi.c
+++ b/nicnatsemi.c
@@ -129,5 +129,4 @@ const struct programmer_entry programmer_nicnatsemi = {
 	.init			= nicnatsemi_init,
 	.map_flash_region	= fallback_map,
 	.unmap_flash_region	= fallback_unmap,
-	.delay			= internal_delay,
 };
diff --git a/nicrealtek.c b/nicrealtek.c
index 7bf1ac9e..c96f9980 100644
--- a/nicrealtek.c
+++ b/nicrealtek.c
@@ -148,5 +148,4 @@ const struct programmer_entry programmer_nicrealtek = {
 	.init			= nicrealtek_init,
 	.map_flash_region	= fallback_map,
 	.unmap_flash_region	= fallback_unmap,
-	.delay			= internal_delay,
 };
diff --git a/ogp_spi.c b/ogp_spi.c
index 94915a33..52b1d4ee 100644
--- a/ogp_spi.c
+++ b/ogp_spi.c
@@ -180,5 +180,4 @@ const struct programmer_entry programmer_ogp_spi = {
 	.init			= ogp_spi_init,
 	.map_flash_region	= fallback_map,
 	.unmap_flash_region	= fallback_unmap,
-	.delay			= internal_delay,
 };
diff --git a/parade_lspcon.c b/parade_lspcon.c
index 761e46be..72f76000 100644
--- a/parade_lspcon.c
+++ b/parade_lspcon.c
@@ -509,5 +509,4 @@ const struct programmer_entry programmer_parade_lspcon = {
 	.init			= parade_lspcon_init,
 	.map_flash_region	= fallback_map,
 	.unmap_flash_region	= fallback_unmap,
-	.delay			= internal_delay,
 };
diff --git a/pickit2_spi.c b/pickit2_spi.c
index b838234d..f550b4ff 100644
--- a/pickit2_spi.c
+++ b/pickit2_spi.c
@@ -513,5 +513,4 @@ const struct programmer_entry programmer_pickit2_spi = {
 	.init			= pickit2_spi_init,
 	.map_flash_region	= fallback_map,
 	.unmap_flash_region	= fallback_unmap,
-	.delay			= internal_delay,
 };
diff --git a/pony_spi.c b/pony_spi.c
index ebeac94a..63359d26 100644
--- a/pony_spi.c
+++ b/pony_spi.c
@@ -274,5 +274,4 @@ const struct programmer_entry programmer_pony_spi = {
 	.init			= pony_spi_init,
 	.map_flash_region	= fallback_map,
 	.unmap_flash_region	= fallback_unmap,
-	.delay			= internal_delay,
 };
diff --git a/raiden_debug_spi.c b/raiden_debug_spi.c
index 28cab067..9ded5858 100644
--- a/raiden_debug_spi.c
+++ b/raiden_debug_spi.c
@@ -1651,5 +1651,4 @@ const struct programmer_entry programmer_raiden_debug_spi = {
 	.init			= raiden_debug_spi_init,
 	.map_flash_region	= fallback_map,
 	.unmap_flash_region	= fallback_unmap,
-	.delay			= internal_delay,
 };
diff --git a/rayer_spi.c b/rayer_spi.c
index 3867cfc8..cd7a0664 100644
--- a/rayer_spi.c
+++ b/rayer_spi.c
@@ -331,5 +331,4 @@ const struct programmer_entry programmer_rayer_spi = {
 	.init			= rayer_spi_init,
 	.map_flash_region	= fallback_map,
 	.unmap_flash_region	= fallback_unmap,
-	.delay			= internal_delay,
 };
diff --git a/realtek_mst_i2c_spi.c b/realtek_mst_i2c_spi.c
index 74458c8e..9637eca2 100644
--- a/realtek_mst_i2c_spi.c
+++ b/realtek_mst_i2c_spi.c
@@ -546,5 +546,4 @@ const struct programmer_entry programmer_realtek_mst_i2c_spi = {
 	.init			= realtek_mst_i2c_spi_init,
 	.map_flash_region	= fallback_map,
 	.unmap_flash_region	= fallback_unmap,
-	.delay			= internal_delay,
 };
diff --git a/satamv.c b/satamv.c
index f8860764..c3831d1d 100644
--- a/satamv.c
+++ b/satamv.c
@@ -213,5 +213,4 @@ const struct programmer_entry programmer_satamv = {
 	.init			= satamv_init,
 	.map_flash_region	= fallback_map,
 	.unmap_flash_region	= fallback_unmap,
-	.delay			= internal_delay,
 };
diff --git a/satasii.c b/satasii.c
index 44b7331e..0f3311f7 100644
--- a/satasii.c
+++ b/satasii.c
@@ -155,5 +155,4 @@ const struct programmer_entry programmer_satasii = {
 	.init			= satasii_init,
 	.map_flash_region	= fallback_map,
 	.unmap_flash_region	= fallback_unmap,
-	.delay			= internal_delay,
 };
diff --git a/stlinkv3_spi.c b/stlinkv3_spi.c
index 38fe9f95..dcbed6dd 100644
--- a/stlinkv3_spi.c
+++ b/stlinkv3_spi.c
@@ -558,5 +558,4 @@ const struct programmer_entry programmer_stlinkv3_spi = {
 	.init			= stlinkv3_spi_init,
 	.map_flash_region	= fallback_map,
 	.unmap_flash_region	= fallback_unmap,
-	.delay			= internal_delay,
 };
diff --git a/usbblaster_spi.c b/usbblaster_spi.c
index 2880a3c3..c5914c41 100644
--- a/usbblaster_spi.c
+++ b/usbblaster_spi.c
@@ -234,5 +234,4 @@ const struct programmer_entry programmer_usbblaster_spi = {
 	.init			= usbblaster_spi_init,
 	.map_flash_region	= fallback_map,
 	.unmap_flash_region	= fallback_unmap,
-	.delay			= internal_delay,
 };