From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753636AbdAZPbY (ORCPT ); Thu, 26 Jan 2017 10:31:24 -0500 Received: from terminus.zytor.com ([65.50.211.136]:47796 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753353AbdAZPbQ (ORCPT ); Thu, 26 Jan 2017 10:31:16 -0500 Date: Thu, 26 Jan 2017 07:29:11 -0800 From: tip-bot for Markus Elfring Message-ID: Cc: wangnan0@huawei.com, hekuang@huawei.com, adrian.hunter@intel.com, peterz@infradead.org, alexander.shishkin@linux.intel.com, linux-kernel@vger.kernel.org, acme@redhat.com, hpa@zytor.com, mingo@kernel.org, elfring@users.sourceforge.net, tglx@linutronix.de, jolsa@kernel.org, mhiramat@kernel.org, ravi.bangoria@linux.vnet.ibm.com, milian.wolff@kdab.com Reply-To: mingo@kernel.org, elfring@users.sourceforge.net, tglx@linutronix.de, jolsa@kernel.org, mhiramat@kernel.org, ravi.bangoria@linux.vnet.ibm.com, milian.wolff@kdab.com, wangnan0@huawei.com, hekuang@huawei.com, adrian.hunter@intel.com, peterz@infradead.org, alexander.shishkin@linux.intel.com, linux-kernel@vger.kernel.org, hpa@zytor.com, acme@redhat.com In-Reply-To: <0ede09ec-79b6-c8bd-5b20-02c63ed98aab@users.sourceforge.net> References: <0ede09ec-79b6-c8bd-5b20-02c63ed98aab@users.sourceforge.net> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf probe: Delete an unnecessary assignment in try_to_find_absolute_address() Git-Commit-ID: d1d0e29cb7d03a6019caa125e4c0288366a4f359 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: d1d0e29cb7d03a6019caa125e4c0288366a4f359 Gitweb: http://git.kernel.org/tip/d1d0e29cb7d03a6019caa125e4c0288366a4f359 Author: Markus Elfring AuthorDate: Mon, 23 Jan 2017 15:10:19 +0100 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 26 Jan 2017 11:42:56 -0300 perf probe: Delete an unnecessary assignment in try_to_find_absolute_address() Remove an error code assignment which is redundant in an if branch for the handling of a memory allocation failure because the same value was set for the local variable "err" before. Signed-off-by: Markus Elfring Acked-by: Masami Hiramatsu Cc: Adrian Hunter Cc: Alexander Shishkin Cc: He Kuang Cc: Jiri Olsa Cc: Milian Wolff Cc: Peter Zijlstra Cc: Ravi Bangoria Cc: Wang Nan Cc: kernel-janitors@vger.kernel.org Link: http://lkml.kernel.org/r/0ede09ec-79b6-c8bd-5b20-02c63ed98aab@users.sourceforge.net Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/probe-event.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c index cdfc468..ded1e7d 100644 --- a/tools/perf/util/probe-event.c +++ b/tools/perf/util/probe-event.c @@ -2994,10 +2994,9 @@ static int try_to_find_absolute_address(struct perf_probe_event *pev, tev->nargs = pev->nargs; tev->args = zalloc(sizeof(struct probe_trace_arg) * tev->nargs); - if (!tev->args) { - err = -ENOMEM; + if (!tev->args) goto errout; - } + for (i = 0; i < tev->nargs; i++) copy_to_probe_trace_arg(&tev->args[i], &pev->args[i]);