[tip:perf/core] perf tools: Remove addr_location argument to sample__fprintf_callchain

From: tip-bot for Arnaldo Carvalho de Melo
Date: Sat Apr 16 2016 - 05:18:08 EST


Commit-ID: d327e60cfae2201bcdee5aeb9b5a42e3988b184f
Gitweb: http://git.kernel.org/tip/d327e60cfae2201bcdee5aeb9b5a42e3988b184f
Author: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
AuthorDate: Thu, 14 Apr 2016 17:53:49 -0300
Committer: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
CommitDate: Thu, 14 Apr 2016 19:46:57 -0300

perf tools: Remove addr_location argument to sample__fprintf_callchain

Not used at all, nuke it.

Cc: Adrian Hunter <adrian.hunter@xxxxxxxxx>
Cc: David Ahern <dsahern@xxxxxxxxx>
Cc: Jiri Olsa <jolsa@xxxxxxxxxx>
Cc: Namhyung Kim <namhyung@xxxxxxxxxx>
Cc: Wang Nan <wangnan0@xxxxxxxxxx>
Link: http://lkml.kernel.org/n/tip-jf2w8ce8nl3wso3vuodg5jci@xxxxxxxxxxxxxx
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
---
tools/perf/builtin-trace.c | 3 +--
tools/perf/util/evsel.c | 8 ++------
tools/perf/util/evsel.h | 4 ++--
3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index 0e2a82b..5e5a95e 100644
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -1898,8 +1898,7 @@ static int trace__fprintf_callchain(struct trace *trace, struct perf_evsel *evse
return 0;
}

- return sample__fprintf_callchain(sample, &al, 38, print_opts,
- &callchain_cursor, trace->output);
+ return sample__fprintf_callchain(sample, 38, print_opts, &callchain_cursor, trace->output);
}

static int trace__sys_exit(struct trace *trace, struct perf_evsel *evsel,
diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index 35c5a52..060f619 100644
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -2343,8 +2343,7 @@ out:
return ++printed;
}

-int sample__fprintf_callchain(struct perf_sample *sample,
- struct addr_location *al, int left_alignment,
+int sample__fprintf_callchain(struct perf_sample *sample, int left_alignment,
unsigned int print_opts, struct callchain_cursor *cursor,
FILE *fp)
{
@@ -2364,9 +2363,6 @@ int sample__fprintf_callchain(struct perf_sample *sample,

callchain_cursor_commit(cursor);

- if (print_symoffset)
- node_al = *al;
-
while (1) {
u64 addr = 0;

@@ -2431,7 +2427,7 @@ int sample__fprintf_sym(struct perf_sample *sample, struct addr_location *al,
int print_unknown_as_addr = print_opts & EVSEL__PRINT_UNKNOWN_AS_ADDR;

if (cursor != NULL) {
- printed += sample__fprintf_callchain(sample, al, left_alignment,
+ printed += sample__fprintf_callchain(sample, left_alignment,
print_opts, cursor, fp);
} else if (!(al->sym && al->sym->ignore)) {
printed += fprintf(fp, "%-*.*s", left_alignment, left_alignment, " ");
diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h
index abadfea..b993218 100644
--- a/tools/perf/util/evsel.h
+++ b/tools/perf/util/evsel.h
@@ -397,8 +397,8 @@ int perf_evsel__fprintf(struct perf_evsel *evsel,

struct callchain_cursor;

-int sample__fprintf_callchain(struct perf_sample *sample, struct addr_location *al,
- int left_alignment, unsigned int print_opts,
+int sample__fprintf_callchain(struct perf_sample *sample, int left_alignment,
+ unsigned int print_opts,
struct callchain_cursor *cursor, FILE *fp);

int sample__fprintf_sym(struct perf_sample *sample, struct addr_location *al,