perf probe: Cleanup find_perf_probe_point_from_map to reduce redundancy

In find_perf_probe_point_from_map(), the 'ret' variable is initialized
with -ENOENT but overwritten by the return code of
kernel_get_symbol_address_by_name(), and after that it is re-initialized
with -ENOENT again.

Setting ret=-ENOENT twice looks a bit redundant. This avoids the
overwriting and just returns -ENOENT if some error happens to simplify
the code.

Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Cc: Zefan Li <lizefan@huawei.com>
Link: http://lkml.kernel.org/n/tip-ufp1zgbktzmttcputozneomd@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
index e659c4faddec3c13f79cdf7eab1ed973f9934ce0..03875f9154e7562c060e5935d30bc65d6ba0973b 100644 (file)
--- a/tools/perf/util/probe-event.c
+++ b/tools/perf/util/probe-event.c
@@ -1895,9 +1895,8 @@ static int find_perf_probe_point_from_map(struct probe_trace_point *tp,
                sym = map__find_symbol(map, addr, NULL);
        } else {
                if (tp->symbol && !addr) {
-                       ret = kernel_get_symbol_address_by_name(tp->symbol,
-                                                       &addr, true, false);
-                       if (ret < 0)
+                       if (kernel_get_symbol_address_by_name(tp->symbol,
+                                               &addr, true, false) < 0)
                                goto out;
                }
                if (addr) {
@@ -1906,8 +1905,6 @@ static int find_perf_probe_point_from_map(struct probe_trace_point *tp,
                }
        }
 
-       /* ret may has be overwritten so reset it */
-       ret = -ENOENT;
        if (!sym)
                goto out;