[<prev] [next>] [day] [month] [year] [list]
Message-ID: <tip-vnpc2rakf6vc98pcl5z1cfrg@git.kernel.org>
Date: Wed, 2 May 2018 11:02:18 -0700
From: tip-bot for Arnaldo Carvalho de Melo <tipbot@...or.com>
To: linux-tip-commits@...r.kernel.org
Cc: jolsa@...nel.org, wangnan0@...wei.com, tglx@...utronix.de,
linux-kernel@...r.kernel.org, hpa@...or.com, namhyung@...nel.org,
adrian.hunter@...el.com, acme@...hat.com, dsahern@...il.com,
mingo@...nel.org
Subject: [tip:perf/core] perf symbols: Remove needless goto
Commit-ID: 857140e81690748ce9a0a7ae7ed91cddb254f51a
Gitweb: https://git.kernel.org/tip/857140e81690748ce9a0a7ae7ed91cddb254f51a
Author: Arnaldo Carvalho de Melo <acme@...hat.com>
AuthorDate: Fri, 27 Apr 2018 10:53:14 -0300
Committer: Arnaldo Carvalho de Melo <acme@...hat.com>
CommitDate: Fri, 27 Apr 2018 10:53:14 -0300
perf symbols: Remove needless goto
We can plain use the an else to the if block that is right after that
goto, so simplify it.
Cc: Adrian Hunter <adrian.hunter@...el.com>
Cc: David Ahern <dsahern@...il.com>
Cc: Jiri Olsa <jolsa@...nel.org>
Cc: Namhyung Kim <namhyung@...nel.org>
Cc: Wang Nan <wangnan0@...wei.com>
Link: https://lkml.kernel.org/n/tip-vnpc2rakf6vc98pcl5z1cfrg@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@...hat.com>
---
tools/perf/util/symbol-elf.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/tools/perf/util/symbol-elf.c b/tools/perf/util/symbol-elf.c
index 5fd81c19eebf..0b230f1a31c4 100644
--- a/tools/perf/util/symbol-elf.c
+++ b/tools/perf/util/symbol-elf.c
@@ -1069,12 +1069,8 @@ int dso__load_sym(struct dso *dso, struct map *map, struct symsrc *syms_ss,
dso__set_loaded(curr_dso);
} else
curr_dso = curr_map->dso;
-
- goto new_symbol;
- }
-
- if ((used_opd && runtime_ss->adjust_symbols)
- || (!used_opd && syms_ss->adjust_symbols)) {
+ } else if ((used_opd && runtime_ss->adjust_symbols) ||
+ (!used_opd && syms_ss->adjust_symbols)) {
pr_debug4("%s: adjusting symbol: st_value: %#" PRIx64 " "
"sh_addr: %#" PRIx64 " sh_offset: %#" PRIx64 "\n", __func__,
(u64)sym.st_value, (u64)shdr.sh_addr,
Powered by blists - more mailing lists