From 942aca232ec8e412160bdc9cd3331a63eaf1ff24 Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Thu, 28 Sep 2023 14:17:20 +0200 Subject: [PATCH] lib: utils: Simplify SET_ISA_EXT_MAP() The define is hard to read. The continue statement does not do what was intended. * Remove do {} while (false); * Change the name to set_multi_letter_ext - Other local macros are lower case too. - Refer to the fact that this is only used for multi-letter extensions. Addresses-Coverity-ID: 1568359 Unexpected control flow Fixes: d72f5f17478d ("lib: utils: Add detection of Smepmp from ISA string in FDT") Signed-off-by: Heinrich Schuchardt Reviewed-by: Xiang W Reviewed-by: Anup Patel --- lib/utils/fdt/fdt_helper.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/utils/fdt/fdt_helper.c b/lib/utils/fdt/fdt_helper.c index 13e79b96..9ae7f09f 100644 --- a/lib/utils/fdt/fdt_helper.c +++ b/lib/utils/fdt/fdt_helper.c @@ -369,16 +369,14 @@ static int fdt_parse_isa_one_hart(const char *isa, unsigned long *extensions) if (!j) continue; -#define SET_ISA_EXT_MAP(name, bit) \ - do { \ +#define set_multi_letter_ext(name, bit) \ if (!strcmp(mstr, name)) { \ __set_bit(bit, extensions); \ continue; \ - } \ - } while (false) \ + } - SET_ISA_EXT_MAP("smepmp", SBI_HART_EXT_SMEPMP); -#undef SET_ISA_EXT_MAP + set_multi_letter_ext("smepmp", SBI_HART_EXT_SMEPMP); +#undef set_multi_letter_ext } return 0;