1 files changed, 9 insertions, 18 deletions

diff --git a/tools/perf/builtin-timechart.c b/tools/perf/builtin-timechart.c
index a589a43112d6..0d4d8ff7914b 100644
--- a/tools/perf/builtin-timechart.c
+++ b/tools/perf/builtin-timechart.c
@@ -280,7 +280,7 @@ static u64 cpus_pstate_state[MAX_CPUS];
 
 static int process_comm_event(event_t *event, struct perf_session *session __used)
 {
-        pid_set_comm(event->comm.pid, event->comm.comm);
+        pid_set_comm(event->comm.tid, event->comm.comm);
         return 0;
 }
 
@@ -1029,33 +1029,24 @@ static void process_samples(struct perf_session *session)
         }
 }
 
-static int sample_type_check(struct perf_session *session)
-{
-        if (!(session->sample_type & PERF_SAMPLE_RAW)) {
-                fprintf(stderr, "No trace samples found in the file.\n"
-                                "Have you used 'perf timechart record' to record it?\n");
-                return -1;
-        }
-
-        return 0;
-}
-
 static struct perf_event_ops event_ops = {
-        .process_comm_event     = process_comm_event,
-        .process_fork_event     = process_fork_event,
-        .process_exit_event     = process_exit_event,
-        .process_sample_event   = queue_sample_event,
-        .sample_type_check      = sample_type_check,
+        .comm   = process_comm_event,
+        .fork   = process_fork_event,
+        .exit   = process_exit_event,
+        .sample = queue_sample_event,
 };
 
 static int __cmd_timechart(void)
 {
         struct perf_session *session = perf_session__new(input_name, O_RDONLY, 0);
-        int ret;
+        int ret = -EINVAL;
 
         if (session == NULL)
                 return -ENOMEM;
 
+        if (!perf_session__has_traces(session, "timechart record"))
+                goto out_delete;
+
         ret = perf_session__process_events(session, &event_ops);
         if (ret)
                 goto out_delete;