Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8f7bbc9 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Remove unused 'unset' parameter from parse_events 



The 'unset' parameter is option callback leftover with no use, removing.

Signed-off-by: default avatarJiri 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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 3cf0cb1f

tools/perf/tests/evsel-roundtrip-name.c

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ static int perf_evsel__roundtrip_cache_name_test(void) 
			for (i = 0; i < PERF_COUNT_HW_CACHE_RESULT_MAX; i++) {

				__perf_evsel__hw_cache_type_op_res_name(type, op, i,

									name, sizeof(name));

				err = parse_events(evlist, name, 0);

				err = parse_events(evlist, name);

				if (err)

					ret = err;

			}
@@ -70,7 +70,7 @@ static int __perf_evsel__name_array_test(const char *names[], int nr_names) 
                return -ENOMEM;



	for (i = 0; i < nr_names; ++i) {

		err = parse_events(evlist, names[i], 0);

		err = parse_events(evlist, names[i]);

		if (err) {

			pr_debug("failed to parse event '%s', err %d\n",

				 names[i], err);

tools/perf/tests/hists_link.c

+2 −2
Original line number Diff line number Diff line
@@ -441,10 +441,10 @@ int test__hists_link(void) 
	if (evlist == NULL)

                return -ENOMEM;



	err = parse_events(evlist, "cpu-clock", 0);

	err = parse_events(evlist, "cpu-clock");

	if (err)

		goto out;

	err = parse_events(evlist, "task-clock", 0);

	err = parse_events(evlist, "task-clock");

	if (err)

		goto out;

tools/perf/tests/parse-events.c

+1 −1
Original line number Diff line number Diff line
@@ -1018,7 +1018,7 @@ static int test_event(struct test__event_st *e) 
	if (evlist == NULL)

		return -ENOMEM;



	ret = parse_events(evlist, e->name, 0);

	ret = parse_events(evlist, e->name);

	if (ret) {

		pr_debug("failed to parse event '%s', err %d\n",

			 e->name, ret);

tools/perf/util/parse-events.c

+2 −3
Original line number Diff line number Diff line
@@ -872,8 +872,7 @@ int parse_events_terms(struct list_head *terms, const char *str) 
	return ret;

}



int parse_events(struct perf_evlist *evlist, const char *str,

		 int unset __maybe_unused)

int parse_events(struct perf_evlist *evlist, const char *str)

{

	struct parse_events_data__events data = {

		.list = LIST_HEAD_INIT(data.list),
@@ -900,7 +899,7 @@ int parse_events_option(const struct option *opt, const char *str, 
			int unset __maybe_unused)

{

	struct perf_evlist *evlist = *(struct perf_evlist **)opt->value;

	int ret = parse_events(evlist, str, unset);

	int ret = parse_events(evlist, str);



	if (ret) {

		fprintf(stderr, "invalid or unsupported event: '%s'\n", str);

tools/perf/util/parse-events.h

+1 −2
Original line number Diff line number Diff line
@@ -29,8 +29,7 @@ const char *event_type(int type); 


extern int parse_events_option(const struct option *opt, const char *str,

			       int unset);

extern int parse_events(struct perf_evlist *evlist, const char *str,

			int unset);

extern int parse_events(struct perf_evlist *evlist, 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);