From fd4336ea5181c7a5da1fb25e0bbc2fb1194515f9 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Wed, 21 Dec 2011 13:25:34 +0100 Subject: [PATCH] --- yaml --- r: 279799 b: refs/heads/master c: 7c324d837f214290febac87da6815dff1ed41d04 h: refs/heads/master i: 279797: d79b14d569544a0b0ed8e9d0d59e95061ab35f9b 279795: 431f5904dbd1d36cfeb137f1b2270b6dba42714c 279791: 3c1c975ce38631cd62bd3d4fb200b40cb74ab758 v: v3 --- [refs] | 2 +- trunk/arch/arm/common/timer-sp.c | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index e8f4edb07788..2668fdd58a80 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4fd7f9b128107034fa925b6877fae3c275f0da86 +refs/heads/master: 7c324d837f214290febac87da6815dff1ed41d04 diff --git a/trunk/arch/arm/common/timer-sp.c b/trunk/arch/arm/common/timer-sp.c index 2393b5bc96fa..8794a34eae61 100644 --- a/trunk/arch/arm/common/timer-sp.c +++ b/trunk/arch/arm/common/timer-sp.c @@ -143,7 +143,6 @@ static int sp804_set_next_event(unsigned long next, } static struct clock_event_device sp804_clockevent = { - .shift = 32, .features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT, .set_mode = sp804_set_mode, .set_next_event = sp804_set_next_event, @@ -169,13 +168,9 @@ void __init sp804_clockevents_init(void __iomem *base, unsigned int irq, clkevt_base = base; clkevt_reload = DIV_ROUND_CLOSEST(rate, HZ); - evt->name = name; evt->irq = irq; - evt->mult = div_sc(rate, NSEC_PER_SEC, evt->shift); - evt->max_delta_ns = clockevent_delta2ns(0xffffffff, evt); - evt->min_delta_ns = clockevent_delta2ns(0xf, evt); setup_irq(irq, &sp804_timer_irq); - clockevents_register_device(evt); + clockevents_config_and_register(evt, rate, 0xf, 0xffffffff); }