提交 d8f7bbc9 编写于 作者: J Jiri Olsa 提交者: Arnaldo Carvalho de Melo

perf tools: Remove unused 'unset' parameter from parse_events

The 'unset' parameter is option callback leftover with no use, removing.
Signed-off-by: NJiri 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.comSigned-off-by: NArnaldo Carvalho de Melo <acme@redhat.com>
上级 3cf0cb1f
...@@ -22,7 +22,7 @@ static int perf_evsel__roundtrip_cache_name_test(void) ...@@ -22,7 +22,7 @@ static int perf_evsel__roundtrip_cache_name_test(void)
for (i = 0; i < PERF_COUNT_HW_CACHE_RESULT_MAX; i++) { for (i = 0; i < PERF_COUNT_HW_CACHE_RESULT_MAX; i++) {
__perf_evsel__hw_cache_type_op_res_name(type, op, i, __perf_evsel__hw_cache_type_op_res_name(type, op, i,
name, sizeof(name)); name, sizeof(name));
err = parse_events(evlist, name, 0); err = parse_events(evlist, name);
if (err) if (err)
ret = err; ret = err;
} }
...@@ -70,7 +70,7 @@ static int __perf_evsel__name_array_test(const char *names[], int nr_names) ...@@ -70,7 +70,7 @@ static int __perf_evsel__name_array_test(const char *names[], int nr_names)
return -ENOMEM; return -ENOMEM;
for (i = 0; i < nr_names; ++i) { for (i = 0; i < nr_names; ++i) {
err = parse_events(evlist, names[i], 0); err = parse_events(evlist, names[i]);
if (err) { if (err) {
pr_debug("failed to parse event '%s', err %d\n", pr_debug("failed to parse event '%s', err %d\n",
names[i], err); names[i], err);
......
...@@ -441,10 +441,10 @@ int test__hists_link(void) ...@@ -441,10 +441,10 @@ int test__hists_link(void)
if (evlist == NULL) if (evlist == NULL)
return -ENOMEM; return -ENOMEM;
err = parse_events(evlist, "cpu-clock", 0); err = parse_events(evlist, "cpu-clock");
if (err) if (err)
goto out; goto out;
err = parse_events(evlist, "task-clock", 0); err = parse_events(evlist, "task-clock");
if (err) if (err)
goto out; goto out;
......
...@@ -1018,7 +1018,7 @@ static int test_event(struct test__event_st *e) ...@@ -1018,7 +1018,7 @@ static int test_event(struct test__event_st *e)
if (evlist == NULL) if (evlist == NULL)
return -ENOMEM; return -ENOMEM;
ret = parse_events(evlist, e->name, 0); ret = parse_events(evlist, e->name);
if (ret) { if (ret) {
pr_debug("failed to parse event '%s', err %d\n", pr_debug("failed to parse event '%s', err %d\n",
e->name, ret); e->name, ret);
......
...@@ -872,8 +872,7 @@ int parse_events_terms(struct list_head *terms, const char *str) ...@@ -872,8 +872,7 @@ int parse_events_terms(struct list_head *terms, const char *str)
return ret; return ret;
} }
int parse_events(struct perf_evlist *evlist, const char *str, int parse_events(struct perf_evlist *evlist, const char *str)
int unset __maybe_unused)
{ {
struct parse_events_data__events data = { struct parse_events_data__events data = {
.list = LIST_HEAD_INIT(data.list), .list = LIST_HEAD_INIT(data.list),
...@@ -900,7 +899,7 @@ int parse_events_option(const struct option *opt, const char *str, ...@@ -900,7 +899,7 @@ int parse_events_option(const struct option *opt, const char *str,
int unset __maybe_unused) int unset __maybe_unused)
{ {
struct perf_evlist *evlist = *(struct perf_evlist **)opt->value; struct perf_evlist *evlist = *(struct perf_evlist **)opt->value;
int ret = parse_events(evlist, str, unset); int ret = parse_events(evlist, str);
if (ret) { if (ret) {
fprintf(stderr, "invalid or unsupported event: '%s'\n", str); fprintf(stderr, "invalid or unsupported event: '%s'\n", str);
......
...@@ -29,8 +29,7 @@ const char *event_type(int type); ...@@ -29,8 +29,7 @@ const char *event_type(int type);
extern int parse_events_option(const struct option *opt, const char *str, extern int parse_events_option(const struct option *opt, const char *str,
int unset); int unset);
extern int parse_events(struct perf_evlist *evlist, const char *str, extern int parse_events(struct perf_evlist *evlist, const char *str);
int unset);
extern int parse_events_terms(struct list_head *terms, const char *str); extern int parse_events_terms(struct list_head *terms, const char *str);
extern int parse_filter(const struct option *opt, const char *str, int unset); extern int parse_filter(const struct option *opt, const char *str, int unset);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册