perf tools: Remove perf_tool from event_op2

Now that we keep a perf_tool pointer inside perf_session, there's no
need to have a perf_tool argument in the event_op2 callback. Remove it.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexey Budankov <alexey.budankov@linux.intel.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20180913125450.21342-2-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

1 files changed, 18 insertions, 20 deletions

diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index 6176bae177c2..765391b6c88c 100644
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -2965,9 +2965,8 @@ static void script__setup_sample_type(struct perf_script *script)
         }
 }
 
-static int process_stat_round_event(struct perf_tool *tool __maybe_unused,
-                                    union perf_event *event,
-                                    struct perf_session *session)
+static int process_stat_round_event(struct perf_session *session,
+                                    union perf_event *event)
 {
         struct stat_round_event *round = &event->stat_round;
         struct perf_evsel *counter;
@@ -2981,9 +2980,8 @@ static int process_stat_round_event(struct perf_tool *tool __maybe_unused,
         return 0;
 }
 
-static int process_stat_config_event(struct perf_tool *tool __maybe_unused,
-                                     union perf_event *event,
-                                     struct perf_session *session __maybe_unused)
+static int process_stat_config_event(struct perf_session *session __maybe_unused,
+                                     union perf_event *event)
 {
         perf_event__read_stat_config(&stat_config, &event->stat_config);
         return 0;
@@ -3009,10 +3007,10 @@ static int set_maps(struct perf_script *script)
 }
 
 static
-int process_thread_map_event(struct perf_tool *tool,
-                             union perf_event *event,
-                             struct perf_session *session __maybe_unused)
+int process_thread_map_event(struct perf_session *session,
+                             union perf_event *event)
 {
+        struct perf_tool *tool = session->tool;
         struct perf_script *script = container_of(tool, struct perf_script, tool);
 
         if (script->threads) {
@@ -3028,10 +3026,10 @@ int process_thread_map_event(struct perf_tool *tool,
 }
 
 static
-int process_cpu_map_event(struct perf_tool *tool __maybe_unused,
-                          union perf_event *event,
-                          struct perf_session *session __maybe_unused)
+int process_cpu_map_event(struct perf_session *session,
+                          union perf_event *event)
 {
+        struct perf_tool *tool = session->tool;
         struct perf_script *script = container_of(tool, struct perf_script, tool);
 
         if (script->cpus) {
@@ -3046,21 +3044,21 @@ int process_cpu_map_event(struct perf_tool *tool __maybe_unused,
         return set_maps(script);
 }
 
-static int process_feature_event(struct perf_tool *tool,
-                                 union perf_event *event,
-                                 struct perf_session *session)
+static int process_feature_event(struct perf_session *session,
+                                 union perf_event *event)
 {
         if (event->feat.feat_id < HEADER_LAST_FEATURE)
-                return perf_event__process_feature(tool, event, session);
+                return perf_event__process_feature(session, event);
         return 0;
 }
 
 #ifdef HAVE_AUXTRACE_SUPPORT
-static int perf_script__process_auxtrace_info(struct perf_tool *tool,
-                                              union perf_event *event,
-                                              struct perf_session *session)
+static int perf_script__process_auxtrace_info(struct perf_session *session,
+                                              union perf_event *event)
 {
-        int ret = perf_event__process_auxtrace_info(tool, event, session);
+        struct perf_tool *tool = session->tool;
+
+        int ret = perf_event__process_auxtrace_info(session, event);
 
         if (ret == 0) {
                 struct perf_script *script = container_of(tool, struct perf_script, tool);