1 files changed, 10 insertions, 10 deletions

diff --git a/kernel/time/tick-broadcast.c b/kernel/time/tick-broadcast.c
index 542d5bb5c13d..f0f8ee9dbc28 100644
--- a/kernel/time/tick-broadcast.c
+++ b/kernel/time/tick-broadcast.c
@@ -303,7 +303,7 @@ static void tick_handle_periodic_broadcast(struct clock_event_device *dev)
         /*
          * The device is in periodic mode. No reprogramming necessary:
          */
-        if (dev->mode == CLOCK_EVT_MODE_PERIODIC)
+        if (dev->state == CLOCK_EVT_STATE_PERIODIC)
                 goto unlock;
 
         /*
@@ -532,8 +532,8 @@ static int tick_broadcast_set_event(struct clock_event_device *bc, int cpu,
 {
         int ret;
 
-        if (bc->mode != CLOCK_EVT_MODE_ONESHOT)
-                clockevents_set_mode(bc, CLOCK_EVT_MODE_ONESHOT);
+        if (bc->state != CLOCK_EVT_STATE_ONESHOT)
+                clockevents_set_state(bc, CLOCK_EVT_STATE_ONESHOT);
 
         ret = clockevents_program_event(bc, expires, force);
         if (!ret)
@@ -543,7 +543,7 @@ static int tick_broadcast_set_event(struct clock_event_device *bc, int cpu,
 
 int tick_resume_broadcast_oneshot(struct clock_event_device *bc)
 {
-        clockevents_set_mode(bc, CLOCK_EVT_MODE_ONESHOT);
+        clockevents_set_state(bc, CLOCK_EVT_STATE_ONESHOT);
         return 0;
 }
 
@@ -562,8 +562,8 @@ void tick_check_oneshot_broadcast_this_cpu(void)
                  * switched over, leave the device alone.
                  */
                 if (td->mode == TICKDEV_MODE_ONESHOT) {
-                        clockevents_set_mode(td->evtdev,
-                                             CLOCK_EVT_MODE_ONESHOT);
+                        clockevents_set_state(td->evtdev,
+                                              CLOCK_EVT_STATE_ONESHOT);
                 }
         }
 }
@@ -666,7 +666,7 @@ static void broadcast_shutdown_local(struct clock_event_device *bc,
                 if (dev->next_event.tv64 < bc->next_event.tv64)
                         return;
         }
-        clockevents_set_mode(dev, CLOCK_EVT_MODE_SHUTDOWN);
+        clockevents_set_state(dev, CLOCK_EVT_STATE_SHUTDOWN);
 }
 
 static void broadcast_move_bc(int deadcpu)
@@ -741,7 +741,7 @@ int tick_broadcast_oneshot_control(unsigned long reason)
                         cpumask_clear_cpu(cpu, tick_broadcast_oneshot_mask);
         } else {
                 if (cpumask_test_and_clear_cpu(cpu, tick_broadcast_oneshot_mask)) {
-                        clockevents_set_mode(dev, CLOCK_EVT_MODE_ONESHOT);
+                        clockevents_set_state(dev, CLOCK_EVT_STATE_ONESHOT);
                         /*
                          * The cpu which was handling the broadcast
                          * timer marked this cpu in the broadcast
@@ -842,7 +842,7 @@ void tick_broadcast_setup_oneshot(struct clock_event_device *bc)
 
         /* Set it up only once ! */
         if (bc->event_handler != tick_handle_oneshot_broadcast) {
-                int was_periodic = bc->mode == CLOCK_EVT_MODE_PERIODIC;
+                int was_periodic = bc->state == CLOCK_EVT_STATE_PERIODIC;
 
                 bc->event_handler = tick_handle_oneshot_broadcast;
 
@@ -858,7 +858,7 @@ void tick_broadcast_setup_oneshot(struct clock_event_device *bc)
                            tick_broadcast_oneshot_mask, tmpmask);
 
                 if (was_periodic && !cpumask_empty(tmpmask)) {
-                        clockevents_set_mode(bc, CLOCK_EVT_MODE_ONESHOT);
+                        clockevents_set_state(bc, CLOCK_EVT_STATE_ONESHOT);
                         tick_broadcast_init_next_event(tmpmask,
                                                        tick_next_period);
                         tick_broadcast_set_event(bc, cpu, tick_next_period, 1);