[PATCH 1/3] clocksource/drivers/ixp4xx: Drop ifdef

Linus Walleij
2019-05-06T06:32:33Z

As the sched_clock registration was put inside an ifdef
in the driver, but this is not appropriate, the ifdef
is only appropriate for delay_timer, which is not yet
implemented.

Fixes: 13e0b4059b98 ("clocksource/drivers/ixp4xx: Add driver")
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
ARM SoC folks: please apply this directly on the IXP4xx
branch where the IXP4xx rework is pending for v5.2.
---
drivers/clocksource/timer-ixp4xx.c | 2 --
1 file changed, 2 deletions(-)

diff --git a/drivers/clocksource/timer-ixp4xx.c b/drivers/clocksource/timer-ixp4xx.c
index 404445bc11ea..5c2190b654cd 100644
--- a/drivers/clocksource/timer-ixp4xx.c
+++ b/drivers/clocksource/timer-ixp4xx.c
@@ -222,9 +222,7 @@ static __init int ixp4xx_timer_register(void __iomem *base,
clockevents_config_and_register(&tmr->clkevt, timer_freq,
0xf, 0xfffffffe);

-#ifdef CONFIG_ARM
sched_clock_register(ixp4xx_read_sched_clock, 32, timer_freq);
-#endif

return 0;
}
--
2.20.1