Skip to content

Commit

Permalink
clocksource/drivers/fttmr010: Factor out clock read code
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Linus Walleij authored and Daniel Lezcano committed Jun 14, 2017
1 parent 385c98f commit c477990
Showing 1 changed file with 6 additions and 10 deletions.
16 changes: 6 additions & 10 deletions drivers/clocksource/timer-fttmr010.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down

0 comments on commit c477990

Please sign in to comment.