hrtimer: clean up unused callback modes

Impact: cleanup

git grep HRTIMER_CB_IRQSAFE revealed half the callback modes are actually
unused.

Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

2 files changed, 0 insertions, 14 deletions

diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h
index 07e510a3b00a..3eba43878dcb 100644
--- a/include/linux/hrtimer.h
+++ b/include/linux/hrtimer.h
@@ -46,9 +46,6 @@ enum hrtimer_restart {
  * hrtimer callback modes:
  *
  *      HRTIMER_CB_SOFTIRQ:             Callback must run in softirq context
- *      HRTIMER_CB_IRQSAFE:             Callback may run in hardirq context
- *      HRTIMER_CB_IRQSAFE_NO_RESTART:  Callback may run in hardirq context and
- *                                      does not restart the timer
  *      HRTIMER_CB_IRQSAFE_PERCPU:      Callback must run in hardirq context
  *                                      Special mode for tick emulation and
  *                                      scheduler timer. Such timers are per
@@ -61,8 +58,6 @@ enum hrtimer_restart {
  */
 enum hrtimer_cb_mode {
         HRTIMER_CB_SOFTIRQ,
-        HRTIMER_CB_IRQSAFE,
-        HRTIMER_CB_IRQSAFE_NO_RESTART,
         HRTIMER_CB_IRQSAFE_PERCPU,
         HRTIMER_CB_IRQSAFE_UNLOCKED,
 };
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index 95d3949f2ae5..47e63349d1b2 100644
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@ -664,14 +664,6 @@ static inline int hrtimer_enqueue_reprogram(struct hrtimer *timer,
 
                 /* Timer is expired, act upon the callback mode */
                 switch(timer->cb_mode) {
-                case HRTIMER_CB_IRQSAFE_NO_RESTART:
-                        debug_hrtimer_deactivate(timer);
-                        /*
-                         * We can call the callback from here. No restart
-                         * happens, so no danger of recursion
-                         */
-                        BUG_ON(timer->function(timer) != HRTIMER_NORESTART);
-                        return 1;
                 case HRTIMER_CB_IRQSAFE_PERCPU:
                 case HRTIMER_CB_IRQSAFE_UNLOCKED:
                         /*
@@ -683,7 +675,6 @@ static inline int hrtimer_enqueue_reprogram(struct hrtimer *timer,
                          */
                         debug_hrtimer_deactivate(timer);
                         return 1;
-                case HRTIMER_CB_IRQSAFE:
                 case HRTIMER_CB_SOFTIRQ:
                         /*
                          * Move everything else into the softirq pending list !