summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2017-06-13 23:48:13 +0200
committerDaniel Lezcano <daniel.lezcano@linaro.org>2017-06-14 12:02:50 +0200
commitc477990295a78f1248283322bd1ad964c22151bc (patch)
treea1439c22df958cc7e842bab7107aa05519335299
parentclocksource/drivers/fttmr010: Implement delay timer (diff)
downloadlinux-c477990295a78f1248283322bd1ad964c22151bc.tar.xz
linux-c477990295a78f1248283322bd1ad964c22151bc.zip
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 <daniel.lezcano@linaro.org> Cc: Andrew Jeffery <andrew@aj.id.au> Cc: Joel Stanley <joel@jms.id.au> Cc: Jonas Jensen <jonas.jensen@gmail.com> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
-rw-r--r--drivers/clocksource/timer-fttmr010.c16
1 files changed, 6 insertions, 10 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,30 +98,26 @@ 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)
+static unsigned long fttmr010_read_current_timer_up(void)
{
return readl(local_fttmr->base + TIMER2_COUNT);
}
-static u64 notrace fttmr010_read_sched_clock_down(void)
+static unsigned long fttmr010_read_current_timer_down(void)
{
return ~readl(local_fttmr->base + TIMER2_COUNT);
}
-#ifdef CONFIG_ARM
-
-static unsigned long fttmr010_read_current_timer_up(void)
+static u64 notrace fttmr010_read_sched_clock_up(void)
{
- return readl(local_fttmr->base + TIMER2_COUNT);
+ return fttmr010_read_current_timer_up();
}
-static unsigned long fttmr010_read_current_timer_down(void)
+static u64 notrace fttmr010_read_sched_clock_down(void)
{
- return ~readl(local_fttmr->base + TIMER2_COUNT);
+ return fttmr010_read_current_timer_down();
}
-#endif
-
static int fttmr010_timer_set_next_event(unsigned long cycles,
struct clock_event_device *evt)
{