diff options
author | Jiri Olsa <jolsa@redhat.com> | 2013-01-15 08:39:51 -0500 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2013-01-24 14:40:40 -0500 |
commit | d8f7bbc947afb59c68a8574d1fe99b20cff2b1be (patch) | |
tree | e877fc4adddc438f66ac6d03e6f17baac7795793 /tools | |
parent | 3cf0cb1f899640f1eb8b3984739cfd70375c9c36 (diff) |
perf tools: Remove unused 'unset' parameter from parse_events
The 'unset' parameter is option callback leftover with no use, removing.
Signed-off-by: Jiri Olsa <jolsa@redhat.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Ulrich Drepper <drepper@gmail.com>
Link: http://lkml.kernel.org/r/1358257194-8204-2-git-send-email-jolsa@redhat.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/perf/tests/evsel-roundtrip-name.c | 4 | ||||
-rw-r--r-- | tools/perf/tests/hists_link.c | 4 | ||||
-rw-r--r-- | tools/perf/tests/parse-events.c | 2 | ||||
-rw-r--r-- | tools/perf/util/parse-events.c | 5 | ||||
-rw-r--r-- | tools/perf/util/parse-events.h | 3 |
5 files changed, 8 insertions, 10 deletions
diff --git a/tools/perf/tests/evsel-roundtrip-name.c b/tools/perf/tests/evsel-roundtrip-name.c index e61fc828a158..0fd99a9adb91 100644 --- a/tools/perf/tests/evsel-roundtrip-name.c +++ b/tools/perf/tests/evsel-roundtrip-name.c | |||
@@ -22,7 +22,7 @@ static int perf_evsel__roundtrip_cache_name_test(void) | |||
22 | for (i = 0; i < PERF_COUNT_HW_CACHE_RESULT_MAX; i++) { | 22 | for (i = 0; i < PERF_COUNT_HW_CACHE_RESULT_MAX; i++) { |
23 | __perf_evsel__hw_cache_type_op_res_name(type, op, i, | 23 | __perf_evsel__hw_cache_type_op_res_name(type, op, i, |
24 | name, sizeof(name)); | 24 | name, sizeof(name)); |
25 | err = parse_events(evlist, name, 0); | 25 | err = parse_events(evlist, name); |
26 | if (err) | 26 | if (err) |
27 | ret = err; | 27 | ret = err; |
28 | } | 28 | } |
@@ -70,7 +70,7 @@ static int __perf_evsel__name_array_test(const char *names[], int nr_names) | |||
70 | return -ENOMEM; | 70 | return -ENOMEM; |
71 | 71 | ||
72 | for (i = 0; i < nr_names; ++i) { | 72 | for (i = 0; i < nr_names; ++i) { |
73 | err = parse_events(evlist, names[i], 0); | 73 | err = parse_events(evlist, names[i]); |
74 | if (err) { | 74 | if (err) { |
75 | pr_debug("failed to parse event '%s', err %d\n", | 75 | pr_debug("failed to parse event '%s', err %d\n", |
76 | names[i], err); | 76 | names[i], err); |
diff --git a/tools/perf/tests/hists_link.c b/tools/perf/tests/hists_link.c index 27860a082381..0afd9223bde7 100644 --- a/tools/perf/tests/hists_link.c +++ b/tools/perf/tests/hists_link.c | |||
@@ -441,10 +441,10 @@ int test__hists_link(void) | |||
441 | if (evlist == NULL) | 441 | if (evlist == NULL) |
442 | return -ENOMEM; | 442 | return -ENOMEM; |
443 | 443 | ||
444 | err = parse_events(evlist, "cpu-clock", 0); | 444 | err = parse_events(evlist, "cpu-clock"); |
445 | if (err) | 445 | if (err) |
446 | goto out; | 446 | goto out; |
447 | err = parse_events(evlist, "task-clock", 0); | 447 | err = parse_events(evlist, "task-clock"); |
448 | if (err) | 448 | if (err) |
449 | goto out; | 449 | goto out; |
450 | 450 | ||
diff --git a/tools/perf/tests/parse-events.c b/tools/perf/tests/parse-events.c index e7eb708da32c..337424d02e53 100644 --- a/tools/perf/tests/parse-events.c +++ b/tools/perf/tests/parse-events.c | |||
@@ -1018,7 +1018,7 @@ static int test_event(struct test__event_st *e) | |||
1018 | if (evlist == NULL) | 1018 | if (evlist == NULL) |
1019 | return -ENOMEM; | 1019 | return -ENOMEM; |
1020 | 1020 | ||
1021 | ret = parse_events(evlist, e->name, 0); | 1021 | ret = parse_events(evlist, e->name); |
1022 | if (ret) { | 1022 | if (ret) { |
1023 | pr_debug("failed to parse event '%s', err %d\n", | 1023 | pr_debug("failed to parse event '%s', err %d\n", |
1024 | e->name, ret); | 1024 | e->name, ret); |
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index 626c120f00da..d3bf570a7084 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c | |||
@@ -872,8 +872,7 @@ int parse_events_terms(struct list_head *terms, const char *str) | |||
872 | return ret; | 872 | return ret; |
873 | } | 873 | } |
874 | 874 | ||
875 | int parse_events(struct perf_evlist *evlist, const char *str, | 875 | int parse_events(struct perf_evlist *evlist, const char *str) |
876 | int unset __maybe_unused) | ||
877 | { | 876 | { |
878 | struct parse_events_data__events data = { | 877 | struct parse_events_data__events data = { |
879 | .list = LIST_HEAD_INIT(data.list), | 878 | .list = LIST_HEAD_INIT(data.list), |
@@ -900,7 +899,7 @@ int parse_events_option(const struct option *opt, const char *str, | |||
900 | int unset __maybe_unused) | 899 | int unset __maybe_unused) |
901 | { | 900 | { |
902 | struct perf_evlist *evlist = *(struct perf_evlist **)opt->value; | 901 | struct perf_evlist *evlist = *(struct perf_evlist **)opt->value; |
903 | int ret = parse_events(evlist, str, unset); | 902 | int ret = parse_events(evlist, str); |
904 | 903 | ||
905 | if (ret) { | 904 | if (ret) { |
906 | fprintf(stderr, "invalid or unsupported event: '%s'\n", str); | 905 | fprintf(stderr, "invalid or unsupported event: '%s'\n", str); |
diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h index b7af80b8bdda..7c5244fa0885 100644 --- a/tools/perf/util/parse-events.h +++ b/tools/perf/util/parse-events.h | |||
@@ -29,8 +29,7 @@ const char *event_type(int type); | |||
29 | 29 | ||
30 | extern int parse_events_option(const struct option *opt, const char *str, | 30 | extern int parse_events_option(const struct option *opt, const char *str, |
31 | int unset); | 31 | int unset); |
32 | extern int parse_events(struct perf_evlist *evlist, const char *str, | 32 | extern int parse_events(struct perf_evlist *evlist, const char *str); |
33 | int unset); | ||
34 | extern int parse_events_terms(struct list_head *terms, const char *str); | 33 | extern int parse_events_terms(struct list_head *terms, const char *str); |
35 | extern int parse_filter(const struct option *opt, const char *str, int unset); | 34 | extern int parse_filter(const struct option *opt, const char *str, int unset); |
36 | 35 | ||