[tip:perf/core] perf ftrace: Remove needless code setting default tracer
From: tip-bot for Taeung Song
Date: Wed Feb 01 2017 - 09:38:05 EST
Commit-ID: bf062bd20e6c4988a9c593824ea6bb58730b6289
Gitweb: http://git.kernel.org/tip/bf062bd20e6c4988a9c593824ea6bb58730b6289
Author: Taeung Song <treeze.taeung@xxxxxxxxx>
AuthorDate: Thu, 26 Jan 2017 18:35:37 +0900
Committer: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
CommitDate: Thu, 26 Jan 2017 15:53:27 -0300
perf ftrace: Remove needless code setting default tracer
As a result of commit a3497642c261 ("perf ftrace: Make 'function_graph'
be the default tracer") the ftrace.tracer variable can't be NULL but the
other code setting default tracer remained.
Signed-off-by: Taeung Song <treeze.taeung@xxxxxxxxx>
Cc: Jiri Olsa <jolsa@xxxxxxxxxx>
Cc: Namhyung Kim <namhyung@xxxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Wang Nan <wangnan0@xxxxxxxxxx>
Link: http://lkml.kernel.org/r/1485423339-22780-1-git-send-email-treeze.taeung@xxxxxxxxx
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
---
tools/perf/builtin-ftrace.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/tools/perf/builtin-ftrace.c b/tools/perf/builtin-ftrace.c
index d05658d..414444d 100644
--- a/tools/perf/builtin-ftrace.c
+++ b/tools/perf/builtin-ftrace.c
@@ -202,7 +202,7 @@ int cmd_ftrace(int argc, const char **argv, const char *prefix __maybe_unused)
{
int ret;
struct perf_ftrace ftrace = {
- .tracer = "function_graph",
+ .tracer = DEFAULT_TRACER,
.target = { .uid = UINT_MAX, },
};
const char * const ftrace_usage[] = {
@@ -231,9 +231,6 @@ int cmd_ftrace(int argc, const char **argv, const char *prefix __maybe_unused)
if (ret < 0)
goto out_delete_evlist;
- if (ftrace.tracer == NULL)
- ftrace.tracer = DEFAULT_TRACER;
-
ret = __cmd_ftrace(&ftrace, argc, argv);
out_delete_evlist: