1 files changed, 9 insertions, 19 deletions

diff --git a/tools/perf/util/scripting-engines/trace-event-python.c b/tools/perf/util/scripting-engines/trace-event-python.c
index 53c20e7fd900..cd9774df3750 100644
--- a/tools/perf/util/scripting-engines/trace-event-python.c
+++ b/tools/perf/util/scripting-engines/trace-event-python.c
@@ -161,8 +161,7 @@ static void define_event_symbols(struct event_format *event,
                 zero_flag_atom = 0;
                 break;
         case PRINT_FIELD:
-                if (cur_field_name)
-                        free(cur_field_name);
+                free(cur_field_name);
                 cur_field_name = strdup(args->field.name);
                 break;
         case PRINT_FLAGS:
@@ -231,13 +230,10 @@ static inline struct event_format *find_cache_event(struct perf_evsel *evsel)
         return event;
 }
 
-static void python_process_tracepoint(union perf_event *perf_event
-                                      __maybe_unused,
-                                 struct perf_sample *sample,
-                                 struct perf_evsel *evsel,
-                                 struct machine *machine __maybe_unused,
-                                 struct thread *thread,
-                                 struct addr_location *al)
+static void python_process_tracepoint(struct perf_sample *sample,
+                                      struct perf_evsel *evsel,
+                                      struct thread *thread,
+                                      struct addr_location *al)
 {
         PyObject *handler, *retval, *context, *t, *obj, *dict = NULL;
         static char handler_name[256];
@@ -351,11 +347,8 @@ static void python_process_tracepoint(union perf_event *perf_event
         Py_DECREF(t);
 }
 
-static void python_process_general_event(union perf_event *perf_event
-                                         __maybe_unused,
-                                         struct perf_sample *sample,
+static void python_process_general_event(struct perf_sample *sample,
                                          struct perf_evsel *evsel,
-                                         struct machine *machine __maybe_unused,
                                          struct thread *thread,
                                          struct addr_location *al)
 {
@@ -411,22 +404,19 @@ exit:
         Py_DECREF(t);
 }
 
-static void python_process_event(union perf_event *perf_event,
+static void python_process_event(union perf_event *event __maybe_unused,
                                  struct perf_sample *sample,
                                  struct perf_evsel *evsel,
-                                 struct machine *machine,
                                  struct thread *thread,
                                  struct addr_location *al)
 {
         switch (evsel->attr.type) {
         case PERF_TYPE_TRACEPOINT:
-                python_process_tracepoint(perf_event, sample, evsel,
-                                          machine, thread, al);
+                python_process_tracepoint(sample, evsel, thread, al);
                 break;
         /* Reserve for future process_hw/sw/raw APIs */
         default:
-                python_process_general_event(perf_event, sample, evsel,
-                                             machine, thread, al);
+                python_process_general_event(sample, evsel, thread, al);
         }
 }