mirror of
https://github.com/torvalds/linux.git
synced 2024-11-23 12:42:02 +00:00
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>
This commit is contained in:
parent
c320642e1c
commit
b97f44c9b6
@ -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) {
|
||||
|
Loading…
Reference in New Issue
Block a user