perf tools: Fix usage of __ in parse_events_term struct

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 parse_events_term and fix
also its 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-h6vkql4jr7dv0096f1s6hldm@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

2 files changed, 7 insertions, 7 deletions

diff --git a/tools/perf/tests/parse-events.c b/tools/perf/tests/parse-events.c
index 337424d02e53..9ac45c58305e 100644
--- a/tools/perf/tests/parse-events.c
+++ b/tools/perf/tests/parse-events.c
@@ -464,10 +464,10 @@ static int test__checkevent_pmu_events(struct perf_evlist *evlist)
 
 static int test__checkterms_simple(struct list_head *terms)
 {
-        struct parse_events__term *term;
+        struct parse_events_term *term;
 
         /* config=10 */
-        term = list_entry(terms->next, struct parse_events__term, list);
+        term = list_entry(terms->next, struct parse_events_term, list);
         TEST_ASSERT_VAL("wrong type term",
                         term->type_term == PARSE_EVENTS__TERM_TYPE_CONFIG);
         TEST_ASSERT_VAL("wrong type val",
@@ -476,7 +476,7 @@ static int test__checkterms_simple(struct list_head *terms)
         TEST_ASSERT_VAL("wrong config", !term->config);
 
         /* config1 */
-        term = list_entry(term->list.next, struct parse_events__term, list);
+        term = list_entry(term->list.next, struct parse_events_term, list);
         TEST_ASSERT_VAL("wrong type term",
                         term->type_term == PARSE_EVENTS__TERM_TYPE_CONFIG1);
         TEST_ASSERT_VAL("wrong type val",
@@ -485,7 +485,7 @@ static int test__checkterms_simple(struct list_head *terms)
         TEST_ASSERT_VAL("wrong config", !term->config);
 
         /* config2=3 */
-        term = list_entry(term->list.next, struct parse_events__term, list);
+        term = list_entry(term->list.next, struct parse_events_term, list);
         TEST_ASSERT_VAL("wrong type term",
                         term->type_term == PARSE_EVENTS__TERM_TYPE_CONFIG2);
         TEST_ASSERT_VAL("wrong type val",
@@ -494,7 +494,7 @@ static int test__checkterms_simple(struct list_head *terms)
         TEST_ASSERT_VAL("wrong config", !term->config);
 
         /* umask=1*/
-        term = list_entry(term->list.next, struct parse_events__term, list);
+        term = list_entry(term->list.next, struct parse_events_term, list);
         TEST_ASSERT_VAL("wrong type term",
                         term->type_term == PARSE_EVENTS__TERM_TYPE_USER);
         TEST_ASSERT_VAL("wrong type val",
diff --git a/tools/perf/tests/pmu.c b/tools/perf/tests/pmu.c
index a5f379863b8f..6803ed1a06dd 100644
--- a/tools/perf/tests/pmu.c
+++ b/tools/perf/tests/pmu.c
@@ -22,7 +22,7 @@ static struct test_format {
 #define TEST_FORMATS_CNT (sizeof(test_formats) / sizeof(struct test_format))
 
 /* Simulated users input. */
-static struct parse_events__term test_terms[] = {
+static struct parse_events_term test_terms[] = {
         {
                 .config    = (char *) "krava01",
                 .val.num   = 15,
@@ -78,7 +78,7 @@ static struct parse_events__term test_terms[] = {
                 .type_term = PARSE_EVENTS__TERM_TYPE_USER,
         },
 };
-#define TERMS_CNT (sizeof(test_terms) / sizeof(struct parse_events__term))
+#define TERMS_CNT (sizeof(test_terms) / sizeof(struct parse_events_term))
 
 /*
  * Prepare format directory data, exported by kernel