Nico Huber has submitted this change and it was merged. ( https://review.coreboot.org/c/flashrom/+/33347 )
Change subject: ichspi.c: Remove unneeded 'else' ......................................................................
ichspi.c: Remove unneeded 'else'
'else' is not needed after a 'break' or 'return'.
Change-Id: Ie000732158f27632ee92404c66a9aab43f3b374c Signed-off-by: Elyes HAOUAS ehaouas@noos.fr Reviewed-on: https://review.coreboot.org/c/flashrom/+/33347 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Nico Huber nico.h@gmx.de --- M ichspi.c 1 file changed, 12 insertions(+), 12 deletions(-)
Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved
diff --git a/ichspi.c b/ichspi.c index a30ca02..6932678 100644 --- a/ichspi.c +++ b/ichspi.c @@ -1244,21 +1244,21 @@ */ static uint32_t ich_hwseq_get_erase_block_size(unsigned int addr) { + uint8_t enc_berase; + static const uint32_t dec_berase[4] = { + 256, + 4 * 1024, + 8 * 1024, + 64 * 1024 + }; + if (hwseq_data.only_4k) { return 4 * 1024; - } else { - uint8_t enc_berase; - static const uint32_t dec_berase[4] = { - 256, - 4 * 1024, - 8 * 1024, - 64 * 1024 - }; - - ich_hwseq_set_addr(addr); - enc_berase = (REGREAD16(ICH9_REG_HSFS) & HSFS_BERASE) >> HSFS_BERASE_OFF; - return dec_berase[enc_berase]; } + + ich_hwseq_set_addr(addr); + enc_berase = (REGREAD16(ICH9_REG_HSFS) & HSFS_BERASE) >> HSFS_BERASE_OFF; + return dec_berase[enc_berase]; }
/* Polls for Cycle Done Status, Flash Cycle Error or timeout in 8 us intervals.