perf symbols: Remove needless goto
authorArnaldo Carvalho de Melo <acme@redhat.com>
Fri, 27 Apr 2018 13:53:14 +0000 (10:53 -0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Fri, 27 Apr 2018 13:53:14 +0000 (10:53 -0300)
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@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: https://lkml.kernel.org/n/tip-vnpc2rakf6vc98pcl5z1cfrg@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/util/symbol-elf.c

index 5fd81c1..0b230f1 100644 (file)
@@ -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,