perf events parse: Remove some needless local variables

Those are just casting a void pointer to a struct to then pass them to
functions, i.e. remove the local variables and pass the void pointer
directly, the casting will be done and the code will be shorter.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-bzfodzr3mb46gy7u7v0mqad6@git.kernel.orgSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent d6d4fc6f
...@@ -225,14 +225,13 @@ event_def: event_pmu | ...@@ -225,14 +225,13 @@ event_def: event_pmu |
event_pmu: event_pmu:
PE_NAME opt_event_config PE_NAME opt_event_config
{ {
struct parse_events_evlist *data = _data;
struct list_head *list, *orig_terms, *terms; struct list_head *list, *orig_terms, *terms;
if (parse_events_copy_term_list($2, &orig_terms)) if (parse_events_copy_term_list($2, &orig_terms))
YYABORT; YYABORT;
ALLOC_LIST(list); ALLOC_LIST(list);
if (parse_events_add_pmu(data, list, $1, $2)) { if (parse_events_add_pmu(_data, list, $1, $2)) {
struct perf_pmu *pmu = NULL; struct perf_pmu *pmu = NULL;
int ok = 0; int ok = 0;
...@@ -245,7 +244,7 @@ PE_NAME opt_event_config ...@@ -245,7 +244,7 @@ PE_NAME opt_event_config
if (!strncmp($1, name, strlen($1))) { if (!strncmp($1, name, strlen($1))) {
if (parse_events_copy_term_list(orig_terms, &terms)) if (parse_events_copy_term_list(orig_terms, &terms))
YYABORT; YYABORT;
if (!parse_events_add_pmu(data, list, pmu->name, terms)) if (!parse_events_add_pmu(_data, list, pmu->name, terms))
ok++; ok++;
parse_events_terms__delete(terms); parse_events_terms__delete(terms);
} }
...@@ -286,26 +285,24 @@ PE_VALUE_SYM_SW ...@@ -286,26 +285,24 @@ PE_VALUE_SYM_SW
event_legacy_symbol: event_legacy_symbol:
value_sym '/' event_config '/' value_sym '/' event_config '/'
{ {
struct parse_events_evlist *data = _data;
struct list_head *list; struct list_head *list;
int type = $1 >> 16; int type = $1 >> 16;
int config = $1 & 255; int config = $1 & 255;
ALLOC_LIST(list); ALLOC_LIST(list);
ABORT_ON(parse_events_add_numeric(data, list, type, config, $3)); ABORT_ON(parse_events_add_numeric(_data, list, type, config, $3));
parse_events_terms__delete($3); parse_events_terms__delete($3);
$$ = list; $$ = list;
} }
| |
value_sym sep_slash_dc value_sym sep_slash_dc
{ {
struct parse_events_evlist *data = _data;
struct list_head *list; struct list_head *list;
int type = $1 >> 16; int type = $1 >> 16;
int config = $1 & 255; int config = $1 & 255;
ALLOC_LIST(list); ALLOC_LIST(list);
ABORT_ON(parse_events_add_numeric(data, list, type, config, NULL)); ABORT_ON(parse_events_add_numeric(_data, list, type, config, NULL));
$$ = list; $$ = list;
} }
...@@ -432,11 +429,10 @@ PE_NAME ':' PE_NAME ...@@ -432,11 +429,10 @@ PE_NAME ':' PE_NAME
event_legacy_numeric: event_legacy_numeric:
PE_VALUE ':' PE_VALUE opt_event_config PE_VALUE ':' PE_VALUE opt_event_config
{ {
struct parse_events_evlist *data = _data;
struct list_head *list; struct list_head *list;
ALLOC_LIST(list); ALLOC_LIST(list);
ABORT_ON(parse_events_add_numeric(data, list, (u32)$1, $3, $4)); ABORT_ON(parse_events_add_numeric(_data, list, (u32)$1, $3, $4));
parse_events_terms__delete($4); parse_events_terms__delete($4);
$$ = list; $$ = list;
} }
...@@ -444,11 +440,10 @@ PE_VALUE ':' PE_VALUE opt_event_config ...@@ -444,11 +440,10 @@ PE_VALUE ':' PE_VALUE opt_event_config
event_legacy_raw: event_legacy_raw:
PE_RAW opt_event_config PE_RAW opt_event_config
{ {
struct parse_events_evlist *data = _data;
struct list_head *list; struct list_head *list;
ALLOC_LIST(list); ALLOC_LIST(list);
ABORT_ON(parse_events_add_numeric(data, list, PERF_TYPE_RAW, $1, $2)); ABORT_ON(parse_events_add_numeric(_data, list, PERF_TYPE_RAW, $1, $2));
parse_events_terms__delete($2); parse_events_terms__delete($2);
$$ = list; $$ = list;
} }
...@@ -468,11 +463,10 @@ PE_BPF_OBJECT opt_event_config ...@@ -468,11 +463,10 @@ PE_BPF_OBJECT opt_event_config
| |
PE_BPF_SOURCE opt_event_config PE_BPF_SOURCE opt_event_config
{ {
struct parse_events_evlist *data = _data;
struct list_head *list; struct list_head *list;
ALLOC_LIST(list); ALLOC_LIST(list);
ABORT_ON(parse_events_load_bpf(data, list, $1, true, $2)); ABORT_ON(parse_events_load_bpf(_data, list, $1, true, $2));
parse_events_terms__delete($2); parse_events_terms__delete($2);
$$ = list; $$ = list;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment