[PATCH 5/7] clocksource/drivers/arm_arch_timer: Replace CONFIG_GENERIC_GETTIMEOFDAY ifdeffery with IS_ENABLED()
Thomas Weißschuh <[email protected]>
| Newsgroups | dev.linux.lists.loongarch,org.infradead.lists.linux-arm-kernel,org.infradead.lists.linux-riscv,org.kernel.vger.linux-arch,org.kernel.vger.linux-kbuild,org.kernel.vger.linux-kernel,org.kernel.vger.linux-mips |
|---|---|
| Message-ID | <[email protected]> |
Now that there is a dummy declaration of VDSO_CLOCKMODE_ARCHTIMER, even if no vDSO is built, the ugly ifdeffery can be replaced with a cleaner IS_ENABLED() check. Signed-off-by: Thomas Weißschuh <[email protected]> --- drivers/clocksource/arm_arch_timer.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index 4adf756423de..d67125a8730a 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -56,11 +56,8 @@ static struct clock_event_device __percpu *arch_timer_evt; static enum arch_timer_ppi_nr arch_timer_uses_ppi __ro_after_init = ARCH_TIMER_VIRT_PPI; static bool arch_timer_c3stop __ro_after_init; static bool arch_counter_suspend_stop __ro_after_init; -#ifdef CONFIG_GENERIC_GETTIMEOFDAY -static enum vdso_clock_mode vdso_default = VDSO_CLOCKMODE_ARCHTIMER; -#else -static enum vdso_clock_mode vdso_default = VDSO_CLOCKMODE_NONE; -#endif /* CONFIG_GENERIC_GETTIMEOFDAY */ +static enum vdso_clock_mode vdso_default = IS_ENABLED(CONFIG_GENERIC_GETTIMEOFDAY) ? + VDSO_CLOCKMODE_ARCHTIMER : VDSO_CLOCKMODE_NONE; static cpumask_t evtstrm_available = CPU_MASK_NONE; static bool evtstrm_enable __ro_after_init = IS_ENABLED(CONFIG_ARM_ARCH_TIMER_EVTSTREAM); -- 2.55.0