From 3edef2f3a680a57d060c8c787de23c88152d4ef4 Mon Sep 17 00:00:00 2001 From: Edward O'Callaghan Date: Sun, 29 Jan 2023 11:52:39 +1100 Subject: jedec.c: Collapse erase_block_jedec() indirection Change-Id: Ia9b539d7fb4a54ba6cc56730e96d35044e291844 Signed-off-by: Edward O'Callaghan Reviewed-on: https://review.coreboot.org/c/flashrom/+/72501 Reviewed-by: Stefan Reinauer Tested-by: build bot (Jenkins) --- jedec.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'jedec.c') diff --git a/jedec.c b/jedec.c index 20f2ff37..43ec0dff 100644 --- a/jedec.c +++ b/jedec.c @@ -313,11 +313,11 @@ int erase_sector_jedec(struct flashctx *flash, unsigned int page, unsigned int s 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 block, 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 @@ int probe_jedec(struct flashctx *flash) 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; -- cgit v1.2.3