Skip to content

Commit

Permalink
perf tools: Remove misplaced __maybe_unused
Browse files Browse the repository at this point in the history 
All over the tree.

Cc: David Ahern <dsahern@gmail.com>
cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Ravi Bangoria <ravi.bangoria@linux.vnet.ibm.com>
Link: http://lkml.kernel.org/n/tip-8nzhnokxyp8y4v7gf0j00oyb@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
  • Loading branch information
Arnaldo Carvalho de Melo committed Mar 23, 2016
1 parent 4ca0d81 commit b8f8eb8
Show file tree
Hide file tree
Showing 15 changed files with 22 additions and 26 deletions.
2 changes: 1 addition & 1 deletion tools/perf/bench/bench.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ extern int bench_numa(int argc, const char **argv, const char *prefix);
extern int bench_sched_messaging(int argc, const char **argv, const char *prefix);
extern int bench_sched_pipe(int argc, const char **argv, const char *prefix);
extern int bench_mem_memcpy(int argc, const char **argv,
const char *prefix __maybe_unused);
const char *prefix);
extern int bench_mem_memset(int argc, const char **argv, const char *prefix);
extern int bench_futex_hash(int argc, const char **argv, const char *prefix);
extern int bench_futex_wake(int argc, const char **argv, const char *prefix);
Expand Down
3 changes: 1 addition & 2 deletions tools/perf/builtin-inject.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,7 @@ static int copy_bytes(struct perf_inject *inject, int fd, off_t size)

static s64 perf_event__repipe_auxtrace(struct perf_tool *tool,
union perf_event *event,
struct perf_session *session
__maybe_unused)
struct perf_session *session)
{
struct perf_inject *inject = container_of(tool, struct perf_inject,
tool);
Expand Down
2 changes: 1 addition & 1 deletion tools/perf/builtin-script.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,7 @@ static void print_sample_brstack(union perf_event *event __maybe_unused,
}
}

static void print_sample_brstacksym(union perf_event *event __maybe_unused,
static void print_sample_brstacksym(union perf_event *event,
struct perf_sample *sample,
struct thread *thread __maybe_unused,
struct perf_event_attr *attr __maybe_unused)
Expand Down
2 changes: 1 addition & 1 deletion tools/perf/ui/gtk/hists.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ static u64 he_get_acc_##_field(struct hist_entry *he) \
return he->stat_acc->_field; \
} \
\
static int perf_gtk__hpp_color_##_type(struct perf_hpp_fmt *fmt __maybe_unused, \
static int perf_gtk__hpp_color_##_type(struct perf_hpp_fmt *fmt, \
struct perf_hpp *hpp, \
struct hist_entry *he) \
{ \
Expand Down
2 changes: 1 addition & 1 deletion tools/perf/util/annotate.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ int symbol__annotate(struct symbol *sym, struct map *map, size_t privsize);

int hist_entry__annotate(struct hist_entry *he, size_t privsize);

int symbol__annotate_init(struct map *map __maybe_unused, struct symbol *sym);
int symbol__annotate_init(struct map *map, struct symbol *sym);
int symbol__annotate_printf(struct symbol *sym, struct map *map,
struct perf_evsel *evsel, bool full_paths,
int min_pcnt, int max_lines, int context);
Expand Down
2 changes: 1 addition & 1 deletion tools/perf/util/auxtrace.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -517,7 +517,7 @@ static inline void auxtrace__free(struct perf_session *session)

static inline struct auxtrace_record *
auxtrace_record__init(struct perf_evlist *evlist __maybe_unused,
int *err __maybe_unused)
int *err)
{
*err = 0;
return NULL;
Expand Down
2 changes: 1 addition & 1 deletion tools/perf/util/data-convert-bt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -632,7 +632,7 @@ static bool is_flush_needed(struct ctf_stream *cs)
}

static int process_sample_event(struct perf_tool *tool,
union perf_event *_event __maybe_unused,
union perf_event *_event,
struct perf_sample *sample,
struct perf_evsel *evsel,
struct machine *machine __maybe_unused)
Expand Down
2 changes: 1 addition & 1 deletion tools/perf/util/dso.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ int __kmod_path__parse(struct kmod_path *m, const char *path,
* TODO
*/
int dso__data_get_fd(struct dso *dso, struct machine *machine);
void dso__data_put_fd(struct dso *dso __maybe_unused);
void dso__data_put_fd(struct dso *dso);
void dso__data_close(struct dso *dso);

off_t dso__data_size(struct dso *dso, struct machine *machine);
Expand Down
2 changes: 1 addition & 1 deletion tools/perf/util/header.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ int perf_event__synthesize_event_update_cpus(struct perf_tool *tool,
perf_event__handler_t process);
int perf_event__process_attr(struct perf_tool *tool, union perf_event *event,
struct perf_evlist **pevlist);
int perf_event__process_event_update(struct perf_tool *tool __maybe_unused,
int perf_event__process_event_update(struct perf_tool *tool,
union perf_event *event,
struct perf_evlist **pevlist);
size_t perf_event__fprintf_event_update(union perf_event *event, FILE *fp);
Expand Down
2 changes: 1 addition & 1 deletion tools/perf/util/hist.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -670,7 +670,7 @@ iter_prepare_branch_entry(struct hist_entry_iter *iter, struct addr_location *al
}

static int
iter_add_single_branch_entry(struct hist_entry_iter *iter __maybe_unused,
iter_add_single_branch_entry(struct hist_entry_iter *iter,
struct addr_location *al __maybe_unused)
{
/* to avoid calling callback function */
Expand Down
3 changes: 1 addition & 2 deletions tools/perf/util/hist.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -433,8 +433,7 @@ void hist__account_cycles(struct branch_stack *bs, struct addr_location *al,
struct perf_sample *sample, bool nonany_branch_mode);

struct option;
int parse_filter_percentage(const struct option *opt __maybe_unused,
const char *arg, int unset __maybe_unused);
int parse_filter_percentage(const struct option *opt, const char *arg, int unset);
int perf_hist_config(const char *var, const char *value);

void perf_hpp_list__init(struct perf_hpp_list *list);
Expand Down
2 changes: 1 addition & 1 deletion tools/perf/util/intel-bts.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -678,7 +678,7 @@ static int intel_bts_process_auxtrace_event(struct perf_session *session,
return 0;
}

static int intel_bts_flush(struct perf_session *session __maybe_unused,
static int intel_bts_flush(struct perf_session *session,
struct perf_tool *tool __maybe_unused)
{
struct intel_bts *bts = container_of(session->auxtrace, struct intel_bts,
Expand Down
2 changes: 1 addition & 1 deletion tools/perf/util/machine.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ int machine__process_aux_event(struct machine *machine,
union perf_event *event);
int machine__process_itrace_start_event(struct machine *machine,
union perf_event *event);
int machine__process_switch_event(struct machine *machine __maybe_unused,
int machine__process_switch_event(struct machine *machine,
union perf_event *event);
int machine__process_mmap_event(struct machine *machine, union perf_event *event,
struct perf_sample *sample);
Expand Down
2 changes: 1 addition & 1 deletion tools/perf/util/sort.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2225,7 +2225,7 @@ int hpp_dimension__add_output(unsigned col)
}

static int sort_dimension__add(struct perf_hpp_list *list, const char *tok,
struct perf_evlist *evlist __maybe_unused,
struct perf_evlist *evlist,
int level)
{
unsigned int i;
Expand Down
18 changes: 8 additions & 10 deletions tools/perf/util/stat-shadow.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,7 @@ static const char *get_ratio_color(enum grc_type type, double ratio)
}

static void print_stalled_cycles_frontend(int cpu,
struct perf_evsel *evsel
__maybe_unused, double avg,
struct perf_evsel *evsel, double avg,
struct perf_stat_output_ctx *out)
{
double total, ratio = 0.0;
Expand All @@ -175,8 +174,7 @@ static void print_stalled_cycles_frontend(int cpu,
}

static void print_stalled_cycles_backend(int cpu,
struct perf_evsel *evsel
__maybe_unused, double avg,
struct perf_evsel *evsel, double avg,
struct perf_stat_output_ctx *out)
{
double total, ratio = 0.0;
Expand All @@ -194,7 +192,7 @@ static void print_stalled_cycles_backend(int cpu,
}

static void print_branch_misses(int cpu,
struct perf_evsel *evsel __maybe_unused,
struct perf_evsel *evsel,
double avg,
struct perf_stat_output_ctx *out)
{
Expand All @@ -213,7 +211,7 @@ static void print_branch_misses(int cpu,
}

static void print_l1_dcache_misses(int cpu,
struct perf_evsel *evsel __maybe_unused,
struct perf_evsel *evsel,
double avg,
struct perf_stat_output_ctx *out)
{
Expand All @@ -232,7 +230,7 @@ static void print_l1_dcache_misses(int cpu,
}

static void print_l1_icache_misses(int cpu,
struct perf_evsel *evsel __maybe_unused,
struct perf_evsel *evsel,
double avg,
struct perf_stat_output_ctx *out)
{
Expand All @@ -250,7 +248,7 @@ static void print_l1_icache_misses(int cpu,
}

static void print_dtlb_cache_misses(int cpu,
struct perf_evsel *evsel __maybe_unused,
struct perf_evsel *evsel,
double avg,
struct perf_stat_output_ctx *out)
{
Expand All @@ -268,7 +266,7 @@ static void print_dtlb_cache_misses(int cpu,
}

static void print_itlb_cache_misses(int cpu,
struct perf_evsel *evsel __maybe_unused,
struct perf_evsel *evsel,
double avg,
struct perf_stat_output_ctx *out)
{
Expand All @@ -286,7 +284,7 @@ static void print_itlb_cache_misses(int cpu,
}

static void print_ll_cache_misses(int cpu,
struct perf_evsel *evsel __maybe_unused,
struct perf_evsel *evsel,
double avg,
struct perf_stat_output_ctx *out)
{
Expand Down

0 comments on commit b8f8eb8

Please sign in to comment.