Commit-ID:  fc50e0ba9bcac92ff177ff3ac64644108b6d8dd8
Gitweb:     https://git.kernel.org/tip/fc50e0ba9bcac92ff177ff3ac64644108b6d8dd8
Author:     Arnaldo Carvalho de Melo <a...@redhat.com>
AuthorDate: Wed, 3 Jul 2019 16:12:51 -0300
Committer:  Arnaldo Carvalho de Melo <a...@redhat.com>
CommitDate: Tue, 9 Jul 2019 09:33:55 -0300

perf evsel: perf_evsel__name(NULL) is valid, no need to check evsel

It'll return "unknown", no need to open code it.

Cc: Adrian Hunter <adrian.hun...@intel.com>
Cc: Jiri Olsa <jo...@kernel.org>
Cc: Leo Yan <leo....@linaro.org>
Cc: Namhyung Kim <namhy...@kernel.org>
Link: https://lkml.kernel.org/n/tip-4okvjmm18arjrcyfhuahg...@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <a...@redhat.com>
---
 tools/perf/builtin-report.c | 2 +-
 tools/perf/util/session.c   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index aef59f318a67..93d4b12e248e 100644
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -298,7 +298,7 @@ static int process_read_event(struct perf_tool *tool,
        struct report *rep = container_of(tool, struct report, tool);
 
        if (rep->show_threads) {
-               const char *name = evsel ? perf_evsel__name(evsel) : "unknown";
+               const char *name = perf_evsel__name(evsel);
                int err = perf_read_values_add_value(&rep->show_threads_values,
                                           event->read.pid, event->read.tid,
                                           evsel->idx,
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index 2e61dd6a3574..e3463df18493 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -1246,7 +1246,7 @@ static void dump_read(struct perf_evsel *evsel, union 
perf_event *event)
                return;
 
        printf(": %d %d %s %" PRIu64 "\n", event->read.pid, event->read.tid,
-              evsel ? perf_evsel__name(evsel) : "FAIL",
+              perf_evsel__name(evsel),
               event->read.value);
 
        if (!evsel)

Reply via email to