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, 2 insertions, 8 deletions

diff --git a/arch/arm/mach-w90x900/time.c b/arch/arm/mach-w90x900/time.c
index d9c3d6b801c7..30fbca844575 100644
--- a/arch/arm/mach-w90x900/time.c
+++ b/arch/arm/mach-w90x900/time.c
@@ -91,7 +91,6 @@ static int nuc900_clockevent_setnextevent(unsigned long evt,
 
 static struct clock_event_device nuc900_clockevent_device = {
         .name           = "nuc900-timer0",
-        .shift          = 32,
         .features       = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
         .set_mode       = nuc900_clockevent_setmode,
         .set_next_event = nuc900_clockevent_setnextevent,
@@ -133,15 +132,10 @@ static void __init nuc900_clockevents_init(void)
         __raw_writel(RESETINT, REG_TISR);
         setup_irq(IRQ_TIMER0, &nuc900_timer0_irq);
 
-        nuc900_clockevent_device.mult = div_sc(rate, NSEC_PER_SEC,
-                                        nuc900_clockevent_device.shift);
-        nuc900_clockevent_device.max_delta_ns = clockevent_delta2ns(0xffffffff,
-                                        &nuc900_clockevent_device);
-        nuc900_clockevent_device.min_delta_ns = clockevent_delta2ns(0xf,
-                                        &nuc900_clockevent_device);
         nuc900_clockevent_device.cpumask = cpumask_of(0);
 
-        clockevents_register_device(&nuc900_clockevent_device);
+        clockevents_config_and_register(&nuc900_clockevent_device, rate,
+                                        0xf, 0xffffffff);
 }
 
 static void __init nuc900_clocksource_init(void)