Edward O'Callaghan has uploaded this change for review.

View Change

jedec.c: Collapse erase_block_jedec() indirection

Change-Id: Ia9b539d7fb4a54ba6cc56730e96d35044e291844
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
---
M jedec.c
1 file changed, 12 insertions(+), 9 deletions(-)

git pull ssh://review.coreboot.org:29418/flashrom refs/changes/01/72501/1

diff --git a/jedec.c b/jedec.c
index 20f2ff3..171d343 100644
--- a/jedec.c
+++ b/jedec.c
@@ -313,11 +313,11 @@
 	return 0;
 }
 
-static int erase_block_jedec_common(struct flashctx *flash, unsigned int block,
-				    unsigned int blocksize, unsigned int mask)
+int erase_block_jedec(struct flashctx *flash, unsigned int page, unsigned int size)
 {
 	chipaddr bios = flash->virtual_memory;
 	bool shifted = (flash->chip->feature_bits & FEATURE_ADDR_SHIFTED);
+	const unsigned int mask = getaddrmask(flash->chip);
 	unsigned int delay_us = 0;
 
 	if(flash->chip->probe_timing != TIMING_ZERO)
@@ -529,13 +529,6 @@
 	return probe_jedec_common(flash, mask);
 }
 
-int erase_block_jedec(struct flashctx *flash, unsigned int page,
-		      unsigned int size)
-{
-	const unsigned int mask = getaddrmask(flash->chip);
-	return erase_block_jedec_common(flash, page, size, mask);
-}
-
 struct unlockblock {
 	unsigned int size;
 	unsigned int count;

To view, visit change 72501. To unsubscribe, or for help writing mail filters, visit settings.