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

[kvmfornfv.git] / kernel / drivers / clocksource / rockchip_timer.c

diff --git a/kernel/drivers/clocksource/rockchip_timer.c b/kernel/drivers/clocksource/rockchip_timer.c
index a35993b..d3c1742 100644 (file)
--- a/kernel/drivers/clocksource/rockchip_timer.c
+++ b/kernel/drivers/clocksource/rockchip_timer.c
@@ -82,23 +82,18 @@ static inline int rk_timer_set_next_event(unsigned long cycles,
        return 0;
 }
 
-static inline void rk_timer_set_mode(enum clock_event_mode mode,
-                                    struct clock_event_device *ce)
+static int rk_timer_shutdown(struct clock_event_device *ce)
 {
-       switch (mode) {
-       case CLOCK_EVT_MODE_PERIODIC:
-               rk_timer_disable(ce);
-               rk_timer_update_counter(rk_timer(ce)->freq / HZ - 1, ce);
-               rk_timer_enable(ce, TIMER_MODE_FREE_RUNNING);
-               break;
-       case CLOCK_EVT_MODE_ONESHOT:
-       case CLOCK_EVT_MODE_RESUME:
-               break;
-       case CLOCK_EVT_MODE_UNUSED:
-       case CLOCK_EVT_MODE_SHUTDOWN:
-               rk_timer_disable(ce);
-               break;
-       }
+       rk_timer_disable(ce);
+       return 0;
+}
+
+static int rk_timer_set_periodic(struct clock_event_device *ce)
+{
+       rk_timer_disable(ce);
+       rk_timer_update_counter(rk_timer(ce)->freq / HZ - 1, ce);
+       rk_timer_enable(ce, TIMER_MODE_FREE_RUNNING);
+       return 0;
 }
 
 static irqreturn_t rk_timer_interrupt(int irq, void *dev_id)
@@ -107,7 +102,7 @@ static irqreturn_t rk_timer_interrupt(int irq, void *dev_id)
 
        rk_timer_interrupt_clear(ce);
 
-       if (ce->mode == CLOCK_EVT_MODE_ONESHOT)
+       if (clockevent_state_oneshot(ce))
                rk_timer_disable(ce);
 
        ce->event_handler(ce);
@@ -153,7 +148,7 @@ static void __init rk_timer_init(struct device_node *np)
        bc_timer.freq = clk_get_rate(timer_clk);
 
        irq = irq_of_parse_and_map(np, 0);
-       if (irq == NO_IRQ) {
+       if (!irq) {
                pr_err("Failed to map interrupts for '%s'\n", TIMER_NAME);
                return;
        }
@@ -161,7 +156,8 @@ static void __init rk_timer_init(struct device_node *np)
        ce->name = TIMER_NAME;
        ce->features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT;
        ce->set_next_event = rk_timer_set_next_event;
-       ce->set_mode = rk_timer_set_mode;
+       ce->set_state_shutdown = rk_timer_shutdown;
+       ce->set_state_periodic = rk_timer_set_periodic;
        ce->irq = irq;
        ce->cpumask = cpumask_of(0);
        ce->rating = 250;