perf tools: Fix usage of __ in event parsing struct names

In tools/perf we use a convention where __ separates the struct name
from the function name for functions that operate on a struct instance.

Fix this usage by removing it from the struct names and fix also the
associated functions.

Acked-by: Jiri Olsa <jolsa@redhat.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-kdcoh7uitivx68otqcz12aaz@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

3 files changed, 17 insertions, 17 deletions

diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index e5c0fcbe8dbe..02f6421f03a0 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -856,7 +856,7 @@ static int parse_events__scanner(const char *str, void *data, int start_token)
  */
 int parse_events_terms(struct list_head *terms, const char *str)
 {
-        struct parse_events_data__terms data = {
+        struct parse_events_terms data = {
                 .terms = NULL,
         };
         int ret;
@@ -874,7 +874,7 @@ int parse_events_terms(struct list_head *terms, const char *str)
 
 int parse_events(struct perf_evlist *evlist, const char *str)
 {
-        struct parse_events_data__events data = {
+        struct parse_events_evlist data = {
                 .list = LIST_HEAD_INIT(data.list),
                 .idx  = evlist->nr_entries,
         };
diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h
index dd2978e7b8c0..2cd2c42a69c5 100644
--- a/tools/perf/util/parse-events.h
+++ b/tools/perf/util/parse-events.h
@@ -61,12 +61,12 @@ struct parse_events_term {
         struct list_head list;
 };
 
-struct parse_events_data__events {
+struct parse_events_evlist {
         struct list_head list;
         int idx;
 };
 
-struct parse_events_data__terms {
+struct parse_events_terms {
         struct list_head *terms;
 };
 
diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y
index 57ecf9db1f29..9d43c86176ff 100644
--- a/tools/perf/util/parse-events.y
+++ b/tools/perf/util/parse-events.y
@@ -79,7 +79,7 @@ PE_START_TERMS  start_terms
 
 start_events: groups
 {
-        struct parse_events_data__events *data = _data;
+        struct parse_events_evlist *data = _data;
 
         parse_events_update_lists($1, &data->list);
 }
@@ -186,7 +186,7 @@ event_def: event_pmu |
 event_pmu:
 PE_NAME '/' event_config '/'
 {
-        struct parse_events_data__events *data = _data;
+        struct parse_events_evlist *data = _data;
         struct list_head *list = NULL;
 
         ABORT_ON(parse_events_add_pmu(&list, &data->idx, $1, $3));
@@ -202,7 +202,7 @@ PE_VALUE_SYM_SW
 event_legacy_symbol:
 value_sym '/' event_config '/'
 {
-        struct parse_events_data__events *data = _data;
+        struct parse_events_evlist *data = _data;
         struct list_head *list = NULL;
         int type = $1 >> 16;
         int config = $1 & 255;
@@ -215,7 +215,7 @@ value_sym '/' event_config '/'
 |
 value_sym sep_slash_dc
 {
-        struct parse_events_data__events *data = _data;
+        struct parse_events_evlist *data = _data;
         struct list_head *list = NULL;
         int type = $1 >> 16;
         int config = $1 & 255;
@@ -228,7 +228,7 @@ value_sym sep_slash_dc
 event_legacy_cache:
 PE_NAME_CACHE_TYPE '-' PE_NAME_CACHE_OP_RESULT '-' PE_NAME_CACHE_OP_RESULT
 {
-        struct parse_events_data__events *data = _data;
+        struct parse_events_evlist *data = _data;
         struct list_head *list = NULL;
 
         ABORT_ON(parse_events_add_cache(&list, &data->idx, $1, $3, $5));
@@ -237,7 +237,7 @@ PE_NAME_CACHE_TYPE '-' PE_NAME_CACHE_OP_RESULT '-' PE_NAME_CACHE_OP_RESULT
 |
 PE_NAME_CACHE_TYPE '-' PE_NAME_CACHE_OP_RESULT
 {
-        struct parse_events_data__events *data = _data;
+        struct parse_events_evlist *data = _data;
         struct list_head *list = NULL;
 
         ABORT_ON(parse_events_add_cache(&list, &data->idx, $1, $3, NULL));
@@ -246,7 +246,7 @@ PE_NAME_CACHE_TYPE '-' PE_NAME_CACHE_OP_RESULT
 |
 PE_NAME_CACHE_TYPE
 {
-        struct parse_events_data__events *data = _data;
+        struct parse_events_evlist *data = _data;
         struct list_head *list = NULL;
 
         ABORT_ON(parse_events_add_cache(&list, &data->idx, $1, NULL, NULL));
@@ -256,7 +256,7 @@ PE_NAME_CACHE_TYPE
 event_legacy_mem:
 PE_PREFIX_MEM PE_VALUE ':' PE_MODIFIER_BP sep_dc
 {
-        struct parse_events_data__events *data = _data;
+        struct parse_events_evlist *data = _data;
         struct list_head *list = NULL;
 
         ABORT_ON(parse_events_add_breakpoint(&list, &data->idx,
@@ -266,7 +266,7 @@ PE_PREFIX_MEM PE_VALUE ':' PE_MODIFIER_BP sep_dc
 |
 PE_PREFIX_MEM PE_VALUE sep_dc
 {
-        struct parse_events_data__events *data = _data;
+        struct parse_events_evlist *data = _data;
         struct list_head *list = NULL;
 
         ABORT_ON(parse_events_add_breakpoint(&list, &data->idx,
@@ -277,7 +277,7 @@ PE_PREFIX_MEM PE_VALUE sep_dc
 event_legacy_tracepoint:
 PE_NAME ':' PE_NAME
 {
-        struct parse_events_data__events *data = _data;
+        struct parse_events_evlist *data = _data;
         struct list_head *list = NULL;
 
         ABORT_ON(parse_events_add_tracepoint(&list, &data->idx, $1, $3));
@@ -287,7 +287,7 @@ PE_NAME ':' PE_NAME
 event_legacy_numeric:
 PE_VALUE ':' PE_VALUE
 {
-        struct parse_events_data__events *data = _data;
+        struct parse_events_evlist *data = _data;
         struct list_head *list = NULL;
 
         ABORT_ON(parse_events_add_numeric(&list, &data->idx, (u32)$1, $3, NULL));
@@ -297,7 +297,7 @@ PE_VALUE ':' PE_VALUE
 event_legacy_raw:
 PE_RAW
 {
-        struct parse_events_data__events *data = _data;
+        struct parse_events_evlist *data = _data;
         struct list_head *list = NULL;
 
         ABORT_ON(parse_events_add_numeric(&list, &data->idx,
@@ -307,7 +307,7 @@ PE_RAW
 
 start_terms: event_config
 {
-        struct parse_events_data__terms *data = _data;
+        struct parse_events_terms *data = _data;
         data->terms = $1;
 }