From d0fbe5344abdf161074181bce452f9d90cff993b Mon Sep 17 00:00:00 2001 From: Edward O'Callaghan Date: Sun, 29 Jan 2023 12:32:51 +1100 Subject: 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) --- jedec.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/jedec.c b/jedec.c index 43ec0dff..697a239f 100644 --- a/jedec.c +++ b/jedec.c @@ -345,12 +345,20 @@ int erase_block_jedec(struct flashctx *flash, unsigned int block, unsigned int s 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 @@ int write_jedec(struct flashctx *flash, const uint8_t *buf, unsigned int start, 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); -- cgit v1.2.3