diff options
| author | Tobias Klauser <tklauser@distanz.ch> | 2014-11-17 18:30:37 +0800 |
|---|---|---|
| committer | Ley Foon Tan <lftan@altera.com> | 2014-12-08 12:56:07 +0800 |
| commit | ac8ab8dd95f6fae76f0742499206d29eea4604cd (patch) | |
| tree | 90e4bfb7904fe3b9cfcc4d913576dc05bedceed6 | |
| parent | 2fc8483fdcde767795402a38a53e647811dc9abf (diff) | |
nios2: Use IS_ENABLED instead of #ifdefs to check config symbols
Make the checking for div/mul/mulx instruction config symbols easier to
read by using IS_ENABLED instead of #ifdefs.
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Acked-by: Ley Foon Tan <lftan@altera.com>
| -rw-r--r-- | arch/nios2/kernel/cpuinfo.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/arch/nios2/kernel/cpuinfo.c b/arch/nios2/kernel/cpuinfo.c index b8081c5f50a1..51d5bb90d3e5 100644 --- a/arch/nios2/kernel/cpuinfo.c +++ b/arch/nios2/kernel/cpuinfo.c @@ -73,18 +73,14 @@ void __init setup_cpuinfo(void) cpuinfo.has_mul = fcpu_has(cpu, "altr,has-mul"); cpuinfo.has_mulx = fcpu_has(cpu, "altr,has-mulx"); -#ifdef CONFIG_NIOS2_HW_DIV_SUPPORT - if (!cpuinfo.has_div) + if (IS_ENABLED(CONFIG_NIOS2_HW_DIV_SUPPORT) && !cpuinfo.has_div) err_cpu("DIV"); -#endif -#ifdef CONFIG_NIOS2_HW_MUL_SUPPORT - if (!cpuinfo.has_mul) + + if (IS_ENABLED(CONFIG_NIOS2_HW_MUL_SUPPORT) && !cpuinfo.has_mul) err_cpu("MUL"); -#endif -#ifdef CONFIG_NIOS2_HW_MULX_SUPPORT - if (!cpuinfo.has_mulx) + + if (IS_ENABLED(CONFIG_NIOS2_HW_MULX_SUPPORT) && !cpuinfo.has_mulx) err_cpu("MULX"); -#endif cpuinfo.tlb_num_ways = fcpu(cpu, "altr,tlb-num-ways"); if (!cpuinfo.tlb_num_ways) |