clockevents/drivers/sun4i: Migrate to new 'set-state' interface

Migrate sun4i driver to the new 'set-state' interface provided by
clockevents core, the earlier 'set-mode' interface is marked obsolete
now.

This also enables us to implement callbacks for new states of clockevent
devices, for example: ONESHOT_STOPPED.

Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>

diff --git a/drivers/clocksource/sun4i_timer.c b/drivers/clocksource/sun4i_timer.c
index 1928a8912584b98e835251442e4313016e112aa2..6f3719d73390fb64d9b7cc0ad83636f1efcbcf85 100644 (file)
--- a/drivers/clocksource/sun4i_timer.c
+++ b/drivers/clocksource/sun4i_timer.c
@@ -81,25 +81,25 @@ static void sun4i_clkevt_time_start(u8 timer, bool periodic)
               timer_base + TIMER_CTL_REG(timer));
 }
 
-static void sun4i_clkevt_mode(enum clock_event_mode mode,
-                             struct clock_event_device *clk)
+static int sun4i_clkevt_shutdown(struct clock_event_device *evt)
 {
-       switch (mode) {
-       case CLOCK_EVT_MODE_PERIODIC:
-               sun4i_clkevt_time_stop(0);
-               sun4i_clkevt_time_setup(0, ticks_per_jiffy);
-               sun4i_clkevt_time_start(0, true);
-               break;
-       case CLOCK_EVT_MODE_ONESHOT:
-               sun4i_clkevt_time_stop(0);
-               sun4i_clkevt_time_start(0, false);
-               break;
-       case CLOCK_EVT_MODE_UNUSED:
-       case CLOCK_EVT_MODE_SHUTDOWN:
-       default:
-               sun4i_clkevt_time_stop(0);
-               break;
-       }
+       sun4i_clkevt_time_stop(0);
+       return 0;
+}
+
+static int sun4i_clkevt_set_oneshot(struct clock_event_device *evt)
+{
+       sun4i_clkevt_time_stop(0);
+       sun4i_clkevt_time_start(0, false);
+       return 0;
+}
+
+static int sun4i_clkevt_set_periodic(struct clock_event_device *evt)
+{
+       sun4i_clkevt_time_stop(0);
+       sun4i_clkevt_time_setup(0, ticks_per_jiffy);
+       sun4i_clkevt_time_start(0, true);
+       return 0;
 }
 
 static int sun4i_clkevt_next_event(unsigned long evt,
@@ -116,7 +116,10 @@ static struct clock_event_device sun4i_clockevent = {
        .name = "sun4i_tick",
        .rating = 350,
        .features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
-       .set_mode = sun4i_clkevt_mode,
+       .set_state_shutdown = sun4i_clkevt_shutdown,
+       .set_state_periodic = sun4i_clkevt_set_periodic,
+       .set_state_oneshot = sun4i_clkevt_set_oneshot,
+       .tick_resume = sun4i_clkevt_shutdown,
        .set_next_event = sun4i_clkevt_next_event,
 };