From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751400AbdATHG6 (ORCPT ); Fri, 20 Jan 2017 02:06:58 -0500 Received: from terminus.zytor.com ([65.50.211.136]:40134 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751260AbdATHG4 (ORCPT ); Fri, 20 Jan 2017 02:06:56 -0500 X-Greylist: delayed 1652 seconds by postgrey-1.27 at vger.kernel.org; Fri, 20 Jan 2017 02:06:56 EST Date: Thu, 19 Jan 2017 23:06:46 -0800 From: tip-bot for Geliang Tang Message-ID: Cc: hpa@zytor.com, geliangtang@gmail.com, john.stultz@linaro.org, mingo@kernel.org, akpm@linux-foundation.org, linux-kernel@vger.kernel.org, tglx@linutronix.de Reply-To: tglx@linutronix.de, linux-kernel@vger.kernel.org, akpm@linux-foundation.org, hpa@zytor.com, john.stultz@linaro.org, mingo@kernel.org, geliangtang@gmail.com In-Reply-To: <0d5cf199ac43792df0b6f7e2145545c30fa1dbbe.1482222135.git.geliangtang@gmail.com> References: <0d5cf199ac43792df0b6f7e2145545c30fa1dbbe.1482222135.git.geliangtang@gmail.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:timers/core] timerqueue: Use rb_entry_safe() instead of open-coding it Git-Commit-ID: d852d39432f5d9822dd0ea8760573448338caf41 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: d852d39432f5d9822dd0ea8760573448338caf41 Gitweb: http://git.kernel.org/tip/d852d39432f5d9822dd0ea8760573448338caf41 Author: Geliang Tang AuthorDate: Tue, 20 Dec 2016 21:57:44 +0800 Committer: Thomas Gleixner CommitDate: Fri, 20 Jan 2017 08:03:42 +0100 timerqueue: Use rb_entry_safe() instead of open-coding it Signed-off-by: Geliang Tang Cc: Andrew Morton Cc: John Stultz Link: http://lkml.kernel.org/r/0d5cf199ac43792df0b6f7e2145545c30fa1dbbe.1482222135.git.geliangtang@gmail.com Signed-off-by: Thomas Gleixner --- lib/timerqueue.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/timerqueue.c b/lib/timerqueue.c index adc6ee0..4a720ed 100644 --- a/lib/timerqueue.c +++ b/lib/timerqueue.c @@ -80,8 +80,7 @@ bool timerqueue_del(struct timerqueue_head *head, struct timerqueue_node *node) if (head->next == node) { struct rb_node *rbn = rb_next(&node->node); - head->next = rbn ? - rb_entry(rbn, struct timerqueue_node, node) : NULL; + head->next = rb_entry_safe(rbn, struct timerqueue_node, node); } rb_erase(&node->node, &head->head); RB_CLEAR_NODE(&node->node);