perf evlist: Use the right prefix for 'struct evlist' raw samples methods

perf_evlist__ is for 'struct perf_evlist' methods, in tools/lib/perf/,
go on completing this split.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/util/s390-sample-raw.c b/tools/perf/util/s390-sample-raw.c
index d177e617983953a02fec0c1855134a826d686f40..cfcf8d534d767052d9da236156c1814f5d2d2a27 100644 (file)
--- a/tools/perf/util/s390-sample-raw.c
+++ b/tools/perf/util/s390-sample-raw.c
@@ -197,8 +197,7 @@ static void s390_cpumcfdg_dump(struct perf_sample *sample)
  * its raw data.
  * The function is only invoked when the dump flag -D is set.
  */
-void perf_evlist__s390_sample_raw(struct evlist *evlist, union perf_event *event,
-                                 struct perf_sample *sample)
+void evlist__s390_sample_raw(struct evlist *evlist, union perf_event *event, struct perf_sample *sample)
 {
        struct evsel *ev_bc000;
 

diff --git a/tools/perf/util/sample-raw.c b/tools/perf/util/sample-raw.c
index e84bbe0e441a06380f621ac004c8b92dba6961da..cde5cd3ce49bf8c90e4ec720cf13d3a95586ac37 100644 (file)
--- a/tools/perf/util/sample-raw.c
+++ b/tools/perf/util/sample-raw.c
@@ -9,10 +9,10 @@
  * Check platform the perf data file was created on and perform platform
  * specific interpretation.
  */
-void perf_evlist__init_trace_event_sample_raw(struct evlist *evlist)
+void evlist__init_trace_event_sample_raw(struct evlist *evlist)
 {
        const char *arch_pf = perf_env__arch(evlist->env);
 
        if (arch_pf && !strcmp("s390", arch_pf))
-               evlist->trace_event_sample_raw = perf_evlist__s390_sample_raw;
+               evlist->trace_event_sample_raw = evlist__s390_sample_raw;
 }

diff --git a/tools/perf/util/sample-raw.h b/tools/perf/util/sample-raw.h
index afe1491a117e7b59f0f04d67ced7225f1c4cc41e..4be84a5510cf0c29fa7a9d042eeeaad8472fd450 100644 (file)
--- a/tools/perf/util/sample-raw.h
+++ b/tools/perf/util/sample-raw.h
@@ -6,9 +6,6 @@ struct evlist;
 union perf_event;
 struct perf_sample;
 
-void perf_evlist__s390_sample_raw(struct evlist *evlist,
-                                 union perf_event *event,
-                                 struct perf_sample *sample);
-
-void perf_evlist__init_trace_event_sample_raw(struct evlist *evlist);
+void evlist__s390_sample_raw(struct evlist *evlist, union perf_event *event, struct perf_sample *sample);
+void evlist__init_trace_event_sample_raw(struct evlist *evlist);
 #endif /* __PERF_EVLIST_H */

diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index bf10576d257ae3cabdc52d8d701f7e3cd95ea59d..83de3209000871c2ec8161b09aa902ed91edc591 100644 (file)
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -221,7 +221,7 @@ struct perf_session *perf_session__new(struct perf_data *data,
                                perf_session__set_comm_exec(session);
                        }
 
-                       perf_evlist__init_trace_event_sample_raw(session->evlist);
+                       evlist__init_trace_event_sample_raw(session->evlist);
 
                        /* Open the directory data. */
                        if (data->is_dir) {