From: Arnaldo Carvalho de Melo Date: Wed, 25 Jan 2017 13:53:40 +0000 Subject: [PATCH 13/23] perf probe: Delete an unnecessary assignment in try_to_find_absolute_address() Message-Id: <20170125135350.22983-14-acme@kernel.org> List-Id: References: <20170125135350.22983-1-acme@kernel.org> In-Reply-To: <20170125135350.22983-1-acme@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Ingo Molnar Cc: linux-kernel@vger.kernel.org, Markus Elfring , Adrian Hunter , Alexander Shishkin , He Kuang , Jiri Olsa , Milian Wolff , Peter Zijlstra , Ravi Bangoria , Wang Nan , kernel-janitors@vger.kernel.org, Arnaldo Carvalho de Melo From: Markus Elfring 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 cdfc468d4d5f..ded1e7d88874 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]); -- 2.9.3