Merge tag 'edac_for_4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp

[cascardo/linux.git] / drivers / clocksource / timer-stm32.c

diff --git a/drivers/clocksource/timer-stm32.c b/drivers/clocksource/timer-stm32.c
index fad2e2e..f3dcb76 100644 (file)
--- a/drivers/clocksource/timer-stm32.c
+++ b/drivers/clocksource/timer-stm32.c
@@ -40,24 +40,25 @@ struct stm32_clock_event_ddata {
        void __iomem *base;
 };
 
-static void stm32_clock_event_set_mode(enum clock_event_mode mode,
-                                      struct clock_event_device *evtdev)
+static int stm32_clock_event_shutdown(struct clock_event_device *evtdev)
 {
        struct stm32_clock_event_ddata *data =
                container_of(evtdev, struct stm32_clock_event_ddata, evtdev);
        void *base = data->base;
 
-       switch (mode) {
-       case CLOCK_EVT_MODE_PERIODIC:
-               writel_relaxed(data->periodic_top, base + TIM_ARR);
-               writel_relaxed(TIM_CR1_ARPE | TIM_CR1_CEN, base + TIM_CR1);
-               break;
+       writel_relaxed(0, base + TIM_CR1);
+       return 0;
+}
 
-       case CLOCK_EVT_MODE_ONESHOT:
-       default:
-               writel_relaxed(0, base + TIM_CR1);
-               break;
-       }
+static int stm32_clock_event_set_periodic(struct clock_event_device *evtdev)
+{
+       struct stm32_clock_event_ddata *data =
+               container_of(evtdev, struct stm32_clock_event_ddata, evtdev);
+       void *base = data->base;
+
+       writel_relaxed(data->periodic_top, base + TIM_ARR);
+       writel_relaxed(TIM_CR1_ARPE | TIM_CR1_CEN, base + TIM_CR1);
+       return 0;
 }
 
 static int stm32_clock_event_set_next_event(unsigned long evt,
@@ -88,7 +89,10 @@ static struct stm32_clock_event_ddata clock_event_ddata = {
        .evtdev = {
                .name = "stm32 clockevent",
                .features = CLOCK_EVT_FEAT_ONESHOT | CLOCK_EVT_FEAT_PERIODIC,
-               .set_mode = stm32_clock_event_set_mode,
+               .set_state_shutdown = stm32_clock_event_shutdown,
+               .set_state_periodic = stm32_clock_event_set_periodic,
+               .set_state_oneshot = stm32_clock_event_shutdown,
+               .tick_resume = stm32_clock_event_shutdown,
                .set_next_event = stm32_clock_event_set_next_event,
                .rating = 200,
        },
@@ -137,9 +141,9 @@ static void __init stm32_clockevent_init(struct device_node *np)
        }
 
        /* Detect whether the timer is 16 or 32 bits */
-       writel_relaxed(~0UL, data->base + TIM_ARR);
+       writel_relaxed(~0U, data->base + TIM_ARR);
        max_delta = readl_relaxed(data->base + TIM_ARR);
-       if (max_delta == ~0UL) {
+       if (max_delta == ~0U) {
                prescaler = 1;
                bits = 32;
        } else {