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

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

diff --git a/kernel/arch/unicore32/kernel/time.c b/kernel/arch/unicore32/kernel/time.c
index d3824b2..ac4c544 100644 (file)
--- a/kernel/arch/unicore32/kernel/time.c
+++ b/kernel/arch/unicore32/kernel/time.c
@@ -46,29 +46,20 @@ puv3_osmr0_set_next_event(unsigned long delta, struct clock_event_device *c)
        return (signed)(next - oscr) <= MIN_OSCR_DELTA ? -ETIME : 0;
 }
 
-static void
-puv3_osmr0_set_mode(enum clock_event_mode mode, struct clock_event_device *c)
+static int puv3_osmr0_shutdown(struct clock_event_device *evt)
 {
-       switch (mode) {
-       case CLOCK_EVT_MODE_ONESHOT:
-       case CLOCK_EVT_MODE_UNUSED:
-       case CLOCK_EVT_MODE_SHUTDOWN:
-               writel(readl(OST_OIER) & ~OST_OIER_E0, OST_OIER);
-               writel(readl(OST_OSSR) & ~OST_OSSR_M0, OST_OSSR);
-               break;
-
-       case CLOCK_EVT_MODE_RESUME:
-       case CLOCK_EVT_MODE_PERIODIC:
-               break;
-       }
+       writel(readl(OST_OIER) & ~OST_OIER_E0, OST_OIER);
+       writel(readl(OST_OSSR) & ~OST_OSSR_M0, OST_OSSR);
+       return 0;
 }
 
 static struct clock_event_device ckevt_puv3_osmr0 = {
-       .name           = "osmr0",
-       .features       = CLOCK_EVT_FEAT_ONESHOT,
-       .rating         = 200,
-       .set_next_event = puv3_osmr0_set_next_event,
-       .set_mode       = puv3_osmr0_set_mode,
+       .name                   = "osmr0",
+       .features               = CLOCK_EVT_FEAT_ONESHOT,
+       .rating                 = 200,
+       .set_next_event         = puv3_osmr0_set_next_event,
+       .set_state_shutdown     = puv3_osmr0_shutdown,
+       .set_state_oneshot      = puv3_osmr0_shutdown,
 };
 
 static cycle_t puv3_read_oscr(struct clocksource *cs)