From c477990295a78f1248283322bd1ad964c22151bc Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Tue, 13 Jun 2017 23:48:13 +0200 Subject: [PATCH] clocksource/drivers/fttmr010: Factor out clock read code The sched_clock() and delay timer callbacks can just call each other and we can save an #ifdef. Suggested-by: Daniel Lezcano Cc: Andrew Jeffery Cc: Joel Stanley Cc: Jonas Jensen Signed-off-by: Linus Walleij Signed-off-by: Daniel Lezcano --- drivers/clocksource/timer-fttmr010.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/drivers/clocksource/timer-fttmr010.c b/drivers/clocksource/timer-fttmr010.c index 009370460f23..66dd909960c6 100644 --- a/drivers/clocksource/timer-fttmr010.c +++ b/drivers/clocksource/timer-fttmr010.c @@ -98,18 +98,6 @@ static inline struct fttmr010 *to_fttmr010(struct clock_event_device *evt) return container_of(evt, struct fttmr010, clkevt); } -static u64 notrace fttmr010_read_sched_clock_up(void) -{ - return readl(local_fttmr->base + TIMER2_COUNT); -} - -static u64 notrace fttmr010_read_sched_clock_down(void) -{ - return ~readl(local_fttmr->base + TIMER2_COUNT); -} - -#ifdef CONFIG_ARM - static unsigned long fttmr010_read_current_timer_up(void) { return readl(local_fttmr->base + TIMER2_COUNT); @@ -120,7 +108,15 @@ static unsigned long fttmr010_read_current_timer_down(void) return ~readl(local_fttmr->base + TIMER2_COUNT); } -#endif +static u64 notrace fttmr010_read_sched_clock_up(void) +{ + return fttmr010_read_current_timer_up(); +} + +static u64 notrace fttmr010_read_sched_clock_down(void) +{ + return fttmr010_read_current_timer_down(); +} static int fttmr010_timer_set_next_event(unsigned long cycles, struct clock_event_device *evt)