Skip to content

Commit

Permalink
hrtimer: Make use of timerqueue_add/del return values
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Thomas Gleixner committed Apr 22, 2015
1 parent c320642 commit b97f44c
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions kernel/time/hrtimer.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/*
Expand All @@ -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);
}

/*
Expand All @@ -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) {
Expand Down

0 comments on commit b97f44c

Please sign in to comment.