Skip to content

Commit e47bddc

Browse files
mmindpalmer-dabbelt
authored andcommitted
riscv: cleanup svpbmt cpufeature probing
For better readability (and compile time coverage) use IS_ENABLED instead of ifdef and drop the new unneeded switch statement. Signed-off-by: Heiko Stuebner <heiko@sntech.de> Reviewed-by: Guo Ren <guoren@kernel.org> Reviewed-by: Conor Dooley <conor.dooley@microchip.com> Reviewed-by: Andrew Jones <ajones@ventanamicro.com> Link: https://lore.kernel.org/r/20220905111027.2463297-2-heiko@sntech.de Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
1 parent cdcdb00 commit e47bddc

1 file changed

Lines changed: 5 additions & 8 deletions

File tree

arch/riscv/kernel/cpufeature.c

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -253,16 +253,13 @@ void __init riscv_fill_hwcap(void)
253253
#ifdef CONFIG_RISCV_ALTERNATIVE
254254
static bool __init_or_module cpufeature_probe_svpbmt(unsigned int stage)
255255
{
256-
#ifdef CONFIG_RISCV_ISA_SVPBMT
257-
switch (stage) {
258-
case RISCV_ALTERNATIVES_EARLY_BOOT:
256+
if (!IS_ENABLED(CONFIG_RISCV_ISA_SVPBMT))
259257
return false;
260-
default:
261-
return riscv_isa_extension_available(NULL, SVPBMT);
262-
}
263-
#endif
264258

265-
return false;
259+
if (stage == RISCV_ALTERNATIVES_EARLY_BOOT)
260+
return false;
261+
262+
return riscv_isa_extension_available(NULL, SVPBMT);
266263
}
267264

268265
static bool __init_or_module cpufeature_probe_zicbom(unsigned int stage)

0 commit comments

Comments
 (0)