[S] Change in flashrom[master]: jedec.c: Collapse erase_chip_block_jedec() indirection

[Edward O'Callaghan (Code Review)]

Edward O'Callaghan has submitted this change. ( https://review.coreboot.org/c/flashrom/+/72503 )

(

1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.
 )Change subject: jedec.c: Collapse erase_chip_block_jedec() indirection
......................................................................

jedec.c: Collapse erase_chip_block_jedec() indirection

Change-Id: I6e4a63e4935d4b69b66cbd1888f62b6af066a2ac
Signed-off-by: Edward O'Callaghan 
Reviewed-on: https://review.coreboot.org/c/flashrom/+/72503
Reviewed-by: Stefan Reinauer 
Tested-by: build bot (Jenkins) 
---
M jedec.c
1 file changed, 24 insertions(+), 16 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Stefan Reinauer: Looks good to me, approved

diff --git a/jedec.c b/jedec.c
index 43ec0df..697a239 100644
--- a/jedec.c
+++ b/jedec.c
@@ -345,12 +345,20 @@
    return 0;
 }

-static int erase_chip_jedec_common(struct flashctx *flash, unsigned int mask)
+/* erase chip with block_erase() prototype */
+int erase_chip_block_jedec(struct flashctx *flash, unsigned int addr, unsigned int blocksize)
 {
-	chipaddr bios = flash->virtual_memory;
-	bool shifted = (flash->chip->feature_bits & FEATURE_ADDR_SHIFTED);
+	const unsigned int mask = getaddrmask(flash->chip);
+	const chipaddr bios = flash->virtual_memory;
+	const bool shifted = (flash->chip->feature_bits & FEATURE_ADDR_SHIFTED);
    unsigned int delay_us = 0;

+	if ((addr != 0) || (blocksize != flash->chip->total_size * 1024)) {
+		msg_cerr("%s called with incorrect arguments\n",
+			__func__);
+		return -1;
+	}
+
    if(flash->chip->probe_timing != TIMING_ZERO)
    	delay_us = 10;

@@ -510,19 +518,6 @@
    return 0;
 }

-/* erase chip with block_erase() prototype */
-int erase_chip_block_jedec(struct flashctx *flash, unsigned int addr,
-			   unsigned int blocksize)
-{
-	const unsigned int mask = getaddrmask(flash->chip);
-	if ((addr != 0) || (blocksize != flash->chip->total_size * 1024)) {
-		msg_cerr("%s called with incorrect arguments\n",
-			__func__);
-		return -1;
-	}
-	return erase_chip_jedec_common(flash, mask);
-}
-
 int probe_jedec(struct flashctx *flash)
 {
    const unsigned int mask = getaddrmask(flash->chip);