From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966811AbdEWIqN (ORCPT ); Tue, 23 May 2017 04:46:13 -0400 Received: from terminus.zytor.com ([65.50.211.136]:37793 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964801AbdEWIqJ (ORCPT ); Tue, 23 May 2017 04:46:09 -0400 Date: Tue, 23 May 2017 01:41:24 -0700 From: tip-bot for Dan Carpenter Message-ID: Cc: acme@redhat.com, tglx@linutronix.de, peterz@infradead.org, dan.carpenter@oracle.com, mingo@kernel.org, eranian@google.com, alexander.shishkin@linux.intel.com, acme@kernel.org, linux-kernel@vger.kernel.org, torvalds@linux-foundation.org, jolsa@redhat.com, hpa@zytor.com, vincent.weaver@maine.edu Reply-To: hpa@zytor.com, jolsa@redhat.com, vincent.weaver@maine.edu, torvalds@linux-foundation.org, mingo@kernel.org, alexander.shishkin@linux.intel.com, eranian@google.com, linux-kernel@vger.kernel.org, acme@kernel.org, acme@redhat.com, dan.carpenter@oracle.com, tglx@linutronix.de, peterz@infradead.org In-Reply-To: <20170522090348.5g7yyld5en3yeky4@mwanda> References: <20170522090348.5g7yyld5en3yeky4@mwanda> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf/core: Remove some dead code Git-Commit-ID: 85c617abc786d7da9e95c0b4174159864dd3f85c 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: 85c617abc786d7da9e95c0b4174159864dd3f85c Gitweb: http://git.kernel.org/tip/85c617abc786d7da9e95c0b4174159864dd3f85c Author: Dan Carpenter AuthorDate: Mon, 22 May 2017 12:03:49 +0300 Committer: Ingo Molnar CommitDate: Tue, 23 May 2017 09:50:05 +0200 perf/core: Remove some dead code perf_init_event() can't return NULL. If it did, the error handling is incomplete and we would crash. I have removed this confusing dead code. Signed-off-by: Dan Carpenter Signed-off-by: Peter Zijlstra (Intel) Cc: Alexander Shishkin Cc: Arnaldo Carvalho de Melo Cc: Arnaldo Carvalho de Melo Cc: Jiri Olsa Cc: Linus Torvalds Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Thomas Gleixner Cc: Vince Weaver Link: http://lkml.kernel.org/r/20170522090348.5g7yyld5en3yeky4@mwanda Signed-off-by: Ingo Molnar --- kernel/events/core.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/kernel/events/core.c b/kernel/events/core.c index 6e75a5c..0028efa 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -9172,7 +9172,7 @@ static int perf_try_init_event(struct pmu *pmu, struct perf_event *event) static struct pmu *perf_init_event(struct perf_event *event) { - struct pmu *pmu = NULL; + struct pmu *pmu; int idx; int ret; @@ -9456,9 +9456,7 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu, } pmu = perf_init_event(event); - if (!pmu) - goto err_ns; - else if (IS_ERR(pmu)) { + if (IS_ERR(pmu)) { err = PTR_ERR(pmu); goto err_ns; }