From 7378557e5460448de704c18bb2b2627152caa935 Mon Sep 17 00:00:00 2001 From: Edward O'Callaghan Date: Mon, 30 Jan 2023 11:45:51 +1100 Subject: jedec.c: Collapse probe_jedec() indirection Change-Id: I57c27bcf25c5d9ce10fb9c74d9be6ab3544ac7ba Signed-off-by: Edward O'Callaghan Reviewed-on: https://review.coreboot.org/c/flashrom/+/72504 Reviewed-by: Stefan Reinauer Tested-by: build bot (Jenkins) --- jedec.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/jedec.c b/jedec.c index 697a239f..b44b9c6a 100644 --- a/jedec.c +++ b/jedec.c @@ -165,11 +165,12 @@ int probe_jedec_29gl(struct flashctx *flash) return 1; } -static int probe_jedec_common(struct flashctx *flash, unsigned int mask) +int probe_jedec(struct flashctx *flash) { - chipaddr bios = flash->virtual_memory; + const chipaddr bios = flash->virtual_memory; const struct flashchip *chip = flash->chip; - bool shifted = (flash->chip->feature_bits & FEATURE_ADDR_SHIFTED); + const bool shifted = (flash->chip->feature_bits & FEATURE_ADDR_SHIFTED); + const unsigned int mask = getaddrmask(flash->chip); uint8_t id1, id2; uint32_t largeid1, largeid2; uint32_t flashcontent1, flashcontent2; @@ -518,12 +519,6 @@ int write_jedec(struct flashctx *flash, const uint8_t *buf, unsigned int start, return 0; } -int probe_jedec(struct flashctx *flash) -{ - const unsigned int mask = getaddrmask(flash->chip); - return probe_jedec_common(flash, mask); -} - struct unlockblock { unsigned int size; unsigned int count; -- cgit v1.2.3