From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754931AbbHCRHL (ORCPT ); Mon, 3 Aug 2015 13:07:11 -0400 Received: from terminus.zytor.com ([198.137.202.10]:40367 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754886AbbHCRHG (ORCPT ); Mon, 3 Aug 2015 13:07:06 -0400 Date: Mon, 3 Aug 2015 10:06:19 -0700 From: tip-bot for Markus Elfring Message-ID: Cc: tglx@linutronix.de, elfring@users.sourceforge.net, efault@gmx.de, torvalds@linux-foundation.org, mingo@kernel.org, linux-kernel@vger.kernel.org, hpa@zytor.com, peterz@infradead.org Reply-To: peterz@infradead.org, torvalds@linux-foundation.org, mingo@kernel.org, linux-kernel@vger.kernel.org, hpa@zytor.com, tglx@linutronix.de, elfring@users.sourceforge.net, efault@gmx.de In-Reply-To: <5597877E.3060503@users.sourceforge.net> References: <5597877E.3060503@users.sourceforge.net> To: linux-tip-commits@vger.kernel.org Subject: [tip:sched/core] sched, sysctl: Delete an unnecessary check before unregister_sysctl_table() Git-Commit-ID: 781b0203423c228b100aaaf169c77b2b556f8a49 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: 781b0203423c228b100aaaf169c77b2b556f8a49 Gitweb: http://git.kernel.org/tip/781b0203423c228b100aaaf169c77b2b556f8a49 Author: Markus Elfring AuthorDate: Sat, 4 Jul 2015 09:06:32 +0200 Committer: Ingo Molnar CommitDate: Mon, 3 Aug 2015 12:21:21 +0200 sched, sysctl: Delete an unnecessary check before unregister_sysctl_table() The unregister_sysctl_table() function tests whether its argument is NULL and then returns immediately. Thus the test around the call is not needed. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring Signed-off-by: Peter Zijlstra (Intel) Cc: Linus Torvalds Cc: Mike Galbraith Cc: Peter Zijlstra Cc: Thomas Gleixner Link: http://lkml.kernel.org/r/5597877E.3060503@users.sourceforge.net Signed-off-by: Ingo Molnar --- kernel/sched/core.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/kernel/sched/core.c b/kernel/sched/core.c index 78b4bad10..48be7dc 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@ -5311,8 +5311,7 @@ static void register_sched_domain_sysctl(void) /* may be called multiple times per register */ static void unregister_sched_domain_sysctl(void) { - if (sd_sysctl_header) - unregister_sysctl_table(sd_sysctl_header); + unregister_sysctl_table(sd_sysctl_header); sd_sysctl_header = NULL; if (sd_ctl_dir[0].child) sd_free_ctl_entry(&sd_ctl_dir[0].child);