__remove_hrtimer() is called from three locations: remove_hrtimer(), __run_hrtimer() and migrate_hrtimer_list(). And all these guarantee that timer was queued earlier. And so there is no need to check if the timer is queued or not in __remove_hrtimer().
Signed-off-by: Viresh Kumar viresh.kumar@linaro.org --- kernel/hrtimer.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index 2702185..04f8e44 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c @@ -875,9 +875,6 @@ static void __remove_hrtimer(struct hrtimer *timer, unsigned long newstate, { struct hrtimer_clock_base *base = timer->base;
- if (!(timer->state & HRTIMER_STATE_ENQUEUED)) - goto out; - timerqueue_del(&base->active, &timer->node);
#ifdef CONFIG_HIGH_RES_TIMERS @@ -891,10 +888,9 @@ static void __remove_hrtimer(struct hrtimer *timer, unsigned long newstate, hrtimer_force_reprogram(base->cpu_base, 1); } #endif + timer->state = newstate; if (!timerqueue_getnext(&base->active)) base->cpu_base->active_bases &= ~(1 << base->index); -out: - timer->state = newstate; }
/* remove hrtimer, called with base lock held */