From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965882AbbDVTJU (ORCPT ); Wed, 22 Apr 2015 15:09:20 -0400 Received: from terminus.zytor.com ([198.137.202.10]:41344 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934397AbbDVTJC (ORCPT ); Wed, 22 Apr 2015 15:09:02 -0400 Date: Wed, 22 Apr 2015 12:08:26 -0700 From: tip-bot for Thomas Gleixner Message-ID: Cc: fweisbec@gmail.com, hpa@zytor.com, preeti@linux.vnet.ibm.com, peterz@infradead.org, viresh.kumar@linaro.org, linux-kernel@vger.kernel.org, tglx@linutronix.de, mtosatti@redhat.com, mingo@kernel.org Reply-To: fweisbec@gmail.com, hpa@zytor.com, preeti@linux.vnet.ibm.com, peterz@infradead.org, viresh.kumar@linaro.org, tglx@linutronix.de, linux-kernel@vger.kernel.org, mingo@kernel.org, mtosatti@redhat.com In-Reply-To: <20150414203501.658152945@linutronix.de> References: <20150414203501.658152945@linutronix.de> To: linux-tip-commits@vger.kernel.org Subject: [tip:timers/core] hrtimer: Make use of timerqueue_add/ del return values Git-Commit-ID: b97f44c9b658d52e0139c947ea5519e51ba38d81 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: b97f44c9b658d52e0139c947ea5519e51ba38d81 Gitweb: http://git.kernel.org/tip/b97f44c9b658d52e0139c947ea5519e51ba38d81 Author: Thomas Gleixner AuthorDate: Tue, 14 Apr 2015 21:08:47 +0000 Committer: Thomas Gleixner CommitDate: Wed, 22 Apr 2015 17:06:50 +0200 hrtimer: Make use of timerqueue_add/del return values Use the return value instead of reevaluating the information. Signed-off-by: Thomas Gleixner Acked-by: Peter Zijlstra Cc: Preeti U Murthy Cc: Viresh Kumar Cc: Marcelo Tosatti Cc: Frederic Weisbecker Link: http://lkml.kernel.org/r/20150414203501.658152945@linutronix.de Signed-off-by: Thomas Gleixner --- kernel/time/hrtimer.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c index fce0ccf..0cd1e0b 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) {