Merge branch 'clocksource/cleanup' into next/cleanup

Clockevent cleanup series from Shawn Guo.

Resolved move/change conflict in mach-pxa/time.c due to the sys_timer
cleanup.

* clocksource/cleanup:
  clocksource: use clockevents_config_and_register() where possible
  ARM: use clockevents_config_and_register() where possible
  clockevents: export clockevents_config_and_register for module use
  + sync to Linux 3.8-rc3

Signed-off-by: Olof Johansson <olof@lixom.net>

Conflicts:
	arch/arm/mach-pxa/time.c

1 files changed, 1 insertions, 8 deletions

diff --git a/arch/arm/mach-lpc32xx/timer.c b/arch/arm/mach-lpc32xx/timer.c
index 88bd4ce3b94a..20eab63d10ba 100644
--- a/arch/arm/mach-lpc32xx/timer.c
+++ b/arch/arm/mach-lpc32xx/timer.c
@@ -70,7 +70,6 @@ static void lpc32xx_clkevt_mode(enum clock_event_mode mode,
 static struct clock_event_device lpc32xx_clkevt = {
         .name           = "lpc32xx_clkevt",
         .features       = CLOCK_EVT_FEAT_ONESHOT,
-        .shift          = 32,
         .rating         = 300,
         .set_next_event = lpc32xx_clkevt_next_event,
         .set_mode       = lpc32xx_clkevt_mode,
@@ -141,14 +140,8 @@ void __init lpc32xx_timer_init(void)
         setup_irq(IRQ_LPC32XX_TIMER0, &lpc32xx_timer_irq);
 
         /* Setup the clockevent structure. */
-        lpc32xx_clkevt.mult = div_sc(clkrate, NSEC_PER_SEC,
-                lpc32xx_clkevt.shift);
-        lpc32xx_clkevt.max_delta_ns = clockevent_delta2ns(-1,
-                &lpc32xx_clkevt);
-        lpc32xx_clkevt.min_delta_ns = clockevent_delta2ns(1,
-                &lpc32xx_clkevt) + 1;
         lpc32xx_clkevt.cpumask = cpumask_of(0);
-        clockevents_register_device(&lpc32xx_clkevt);
+        clockevents_config_and_register(&lpc32xx_clkevt, clkrate, 1, -1);
 
         /* Use timer1 as clock source. */
         __raw_writel(LPC32XX_TIMER_CNTR_TCR_RESET,