summaryrefslogtreecommitdiffstats
path: root/kernel/time/hrtimer.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2015-04-14 23:08:47 +0200
committerThomas Gleixner <tglx@linutronix.de>2015-04-22 17:06:50 +0200
commitb97f44c9b658d52e0139c947ea5519e51ba38d81 (patch)
treeef86d61eb124b2f5cf10bac96557608282c7f7f5 /kernel/time/hrtimer.c
parenttimerqueue: Let timerqueue_add/del return information (diff)
downloadlinux-b97f44c9b658d52e0139c947ea5519e51ba38d81.tar.xz
linux-b97f44c9b658d52e0139c947ea5519e51ba38d81.zip
hrtimer: Make use of timerqueue_add/del return values
Use the return value instead of reevaluating the information. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: Peter Zijlstra <peterz@infradead.org> Cc: Preeti U Murthy <preeti@linux.vnet.ibm.com> Cc: Viresh Kumar <viresh.kumar@linaro.org> Cc: Marcelo Tosatti <mtosatti@redhat.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Link: http://lkml.kernel.org/r/20150414203501.658152945@linutronix.de Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/time/hrtimer.c')
-rw-r--r--kernel/time/hrtimer.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
index fce0ccf97b51..0cd1e0b8099d 100644
--- a/kernel/time/hrtimer.c
+++ b/kernel/time/hrtimer.c
@@ -842,7 +842,6 @@ static int enqueue_hrtimer(struct hrtimer *timer,
{
debug_activate(timer);
- timerqueue_add(&base->active, &timer->node);
base->cpu_base->active_bases |= 1 << base->index;
/*
@@ -851,7 +850,7 @@ static int enqueue_hrtimer(struct hrtimer *timer,
*/
timer->state |= HRTIMER_STATE_ENQUEUED;
- return (&timer->node == base->active.next);
+ return timerqueue_add(&base->active, &timer->node);
}
/*
@@ -875,8 +874,7 @@ static void __remove_hrtimer(struct hrtimer *timer,
goto out;
next_timer = timerqueue_getnext(&base->active);
- timerqueue_del(&base->active, &timer->node);
- if (!timerqueue_getnext(&base->active))
+ if (!timerqueue_del(&base->active, &timer->node))
cpu_base->active_bases &= ~(1 << base->index);
if (&timer->node == next_timer) {