diff options
author | Edward O'Callaghan <quasisec@google.com> | 2023-01-30 11:45:51 +1100 |
---|---|---|
committer | Edward O'Callaghan <quasisec@chromium.org> | 2023-02-02 02:08:00 +0000 |
commit | 7378557e5460448de704c18bb2b2627152caa935 (patch) | |
tree | 07a653c12c6d47bca8a5fb43d23230774accde46 /jedec.c | |
parent | d0fbe5344abdf161074181bce452f9d90cff993b (diff) | |
download | flashrom-7378557e5460448de704c18bb2b2627152caa935.tar.gz flashrom-7378557e5460448de704c18bb2b2627152caa935.tar.bz2 flashrom-7378557e5460448de704c18bb2b2627152caa935.zip |
jedec.c: Collapse probe_jedec() indirection
Change-Id: I57c27bcf25c5d9ce10fb9c74d9be6ab3544ac7ba
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/72504
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'jedec.c')
-rw-r--r-- | jedec.c | 13 |
1 files changed, 4 insertions, 9 deletions
@@ -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; |