These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / arch / score / kernel / time.c

diff --git a/kernel/arch/score/kernel/time.c b/kernel/arch/score/kernel/time.c
index 24770cd..679b8d7 100644 (file)
--- a/kernel/arch/score/kernel/time.c
+++ b/kernel/arch/score/kernel/time.c
@@ -55,31 +55,20 @@ static int score_timer_set_next_event(unsigned long delta,
        return 0;
 }
 
-static void score_timer_set_mode(enum clock_event_mode mode,
-               struct clock_event_device *evdev)
+static int score_timer_set_periodic(struct clock_event_device *evt)
 {
-       switch (mode) {
-       case CLOCK_EVT_MODE_PERIODIC:
-               outl((TMR_M_PERIODIC | TMR_IE_ENABLE), P_TIMER0_CTRL);
-               outl(SYSTEM_CLOCK/HZ, P_TIMER0_PRELOAD);
-               outl(inl(P_TIMER0_CTRL) | TMR_ENABLE, P_TIMER0_CTRL);
-               break;
-       case CLOCK_EVT_MODE_ONESHOT:
-       case CLOCK_EVT_MODE_SHUTDOWN:
-       case CLOCK_EVT_MODE_RESUME:
-       case CLOCK_EVT_MODE_UNUSED:
-               break;
-       default:
-               BUG();
-       }
+       outl((TMR_M_PERIODIC | TMR_IE_ENABLE), P_TIMER0_CTRL);
+       outl(SYSTEM_CLOCK / HZ, P_TIMER0_PRELOAD);
+       outl(inl(P_TIMER0_CTRL) | TMR_ENABLE, P_TIMER0_CTRL);
+       return 0;
 }
 
 static struct clock_event_device score_clockevent = {
-       .name           = "score_clockevent",
-       .features       = CLOCK_EVT_FEAT_PERIODIC,
-       .shift          = 16,
-       .set_next_event = score_timer_set_next_event,
-       .set_mode       = score_timer_set_mode,
+       .name                   = "score_clockevent",
+       .features               = CLOCK_EVT_FEAT_PERIODIC,
+       .shift                  = 16,
+       .set_next_event         = score_timer_set_next_event,
+       .set_state_periodic     = score_timer_set_periodic,
 };
 
 void __init time_init(void)