return HRTIMER_RESTART;
 }
 
-static void tick_sched_timer_cancel(struct tick_sched *ts)
-{
-       if (tick_sched_flag_test(ts, TS_FLAG_HIGHRES))
-               hrtimer_cancel(&ts->sched_timer);
-       else if (tick_sched_flag_test(ts, TS_FLAG_NOHZ))
-               tick_program_event(KTIME_MAX, 1);
-}
-
 #ifdef CONFIG_NO_HZ_FULL
 cpumask_var_t tick_nohz_full_mask;
 EXPORT_SYMBOL_GPL(tick_nohz_full_mask);
         * the tick timer.
         */
        if (unlikely(expires == KTIME_MAX)) {
-               tick_sched_timer_cancel(ts);
+               if (tick_sched_flag_test(ts, TS_FLAG_HIGHRES))
+                       hrtimer_cancel(&ts->sched_timer);
+               else
+                       tick_program_event(KTIME_MAX, 1);
                return;
        }
 
  */
 void tick_sched_timer_dying(int cpu)
 {
-       struct tick_device *td = &per_cpu(tick_cpu_device, cpu);
        struct tick_sched *ts = &per_cpu(tick_cpu_sched, cpu);
-       struct clock_event_device *dev = td->evtdev;
        ktime_t idle_sleeptime, iowait_sleeptime;
        unsigned long idle_calls, idle_sleeps;
 
        /* This must happen before hrtimers are migrated! */
-       tick_sched_timer_cancel(ts);
-
-       /*
-        * If the clockevents doesn't support CLOCK_EVT_STATE_ONESHOT_STOPPED,
-        * make sure not to call low-res tick handler.
-        */
-       if (tick_sched_flag_test(ts, TS_FLAG_NOHZ))
-               dev->event_handler = clockevents_handle_noop;
+       if (tick_sched_flag_test(ts, TS_FLAG_HIGHRES))
+               hrtimer_cancel(&ts->sched_timer);
 
        idle_sleeptime = ts->idle_sleeptime;
        iowait_sleeptime = ts->iowait_sleeptime;