Commit-ID: d1d0e29cb7d03a6019caa125e4c0288366a4f359 Gitweb: http://git.kernel.org/tip/d1d0e29cb7d03a6019caa125e4c0288366a4f359 Author: Markus Elfring <elfr...@users.sourceforge.net> AuthorDate: Mon, 23 Jan 2017 15:10:19 +0100 Committer: Arnaldo Carvalho de Melo <a...@redhat.com> 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 <elfr...@users.sourceforge.net> Acked-by: Masami Hiramatsu <mhira...@kernel.org> Cc: Adrian Hunter <adrian.hun...@intel.com> Cc: Alexander Shishkin <alexander.shish...@linux.intel.com> Cc: He Kuang <heku...@huawei.com> Cc: Jiri Olsa <jo...@kernel.org> Cc: Milian Wolff <milian.wo...@kdab.com> Cc: Peter Zijlstra <pet...@infradead.org> Cc: Ravi Bangoria <ravi.bango...@linux.vnet.ibm.com> Cc: Wang Nan <wangn...@huawei.com> Cc: kernel-janit...@vger.kernel.org Link: http://lkml.kernel.org/r/0ede09ec-79b6-c8bd-5b20-02c63ed98...@users.sourceforge.net Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com> --- 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]);