aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Olsa <jolsa@kernel.org>2015-09-02 03:56:32 -0400
committerArnaldo Carvalho de Melo <acme@redhat.com>2015-09-02 15:30:47 -0400
commitf6a09af7de3b39b1e4fcff7374871f834498b7f0 (patch)
tree70970a0004389c451da5102d0d969988453a6b97
parent245bad8eb45fca36638da53fb0a361397a707001 (diff)
perf tools: Remove mountpoint arg from perf_debugfs_mount
It's not used by any caller. We either detect the mountpoint or use hardcoded one. Signed-off-by: Jiri Olsa <jolsa@kernel.org> Cc: Raphael Beamonte <raphael.beamonte@gmail.com> Cc: David Ahern <dsahern@gmail.com> Cc: Matt Fleming <matt@codeblueprint.co.uk> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Steven Rostedt <rostedt@goodmis.org> Link: http://lkml.kernel.org/r/1441180605-24737-3-git-send-email-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-rw-r--r--tools/perf/perf.c2
-rw-r--r--tools/perf/util/util.c14
-rw-r--r--tools/perf/util/util.h2
3 files changed, 9 insertions, 9 deletions
diff --git a/tools/perf/perf.c b/tools/perf/perf.c
index 07dbff5c0e60..f500a4b40722 100644
--- a/tools/perf/perf.c
+++ b/tools/perf/perf.c
@@ -518,7 +518,7 @@ int main(int argc, const char **argv)
518 if (!cmd) 518 if (!cmd)
519 cmd = "perf-help"; 519 cmd = "perf-help";
520 /* get debugfs mount point from /proc/mounts */ 520 /* get debugfs mount point from /proc/mounts */
521 perf_debugfs_mount(NULL); 521 perf_debugfs_mount();
522 /* 522 /*
523 * "perf-xxxx" is the same as "perf xxxx", but we obviously: 523 * "perf-xxxx" is the same as "perf xxxx", but we obviously:
524 * 524 *
diff --git a/tools/perf/util/util.c b/tools/perf/util/util.c
index 7acafb3c5592..74f71f8afcc2 100644
--- a/tools/perf/util/util.c
+++ b/tools/perf/util/util.c
@@ -398,11 +398,11 @@ static void set_tracing_events_path(const char *tracing, const char *mountpoint)
398 mountpoint, tracing, "events"); 398 mountpoint, tracing, "events");
399} 399}
400 400
401static const char *__perf_tracefs_mount(const char *mountpoint) 401static const char *__perf_tracefs_mount(void)
402{ 402{
403 const char *mnt; 403 const char *mnt;
404 404
405 mnt = tracefs_mount(mountpoint); 405 mnt = tracefs_mount(NULL);
406 if (!mnt) 406 if (!mnt)
407 return NULL; 407 return NULL;
408 408
@@ -411,11 +411,11 @@ static const char *__perf_tracefs_mount(const char *mountpoint)
411 return mnt; 411 return mnt;
412} 412}
413 413
414static const char *__perf_debugfs_mount(const char *mountpoint) 414static const char *__perf_debugfs_mount(void)
415{ 415{
416 const char *mnt; 416 const char *mnt;
417 417
418 mnt = debugfs_mount(mountpoint); 418 mnt = debugfs_mount(NULL);
419 if (!mnt) 419 if (!mnt)
420 return NULL; 420 return NULL;
421 421
@@ -424,15 +424,15 @@ static const char *__perf_debugfs_mount(const char *mountpoint)
424 return mnt; 424 return mnt;
425} 425}
426 426
427const char *perf_debugfs_mount(const char *mountpoint) 427const char *perf_debugfs_mount(void)
428{ 428{
429 const char *mnt; 429 const char *mnt;
430 430
431 mnt = __perf_tracefs_mount(mountpoint); 431 mnt = __perf_tracefs_mount();
432 if (mnt) 432 if (mnt)
433 return mnt; 433 return mnt;
434 434
435 mnt = __perf_debugfs_mount(mountpoint); 435 mnt = __perf_debugfs_mount();
436 436
437 return mnt; 437 return mnt;
438} 438}
diff --git a/tools/perf/util/util.h b/tools/perf/util/util.h
index 09c1a8b7b4c2..48ec232b6f66 100644
--- a/tools/perf/util/util.h
+++ b/tools/perf/util/util.h
@@ -86,7 +86,7 @@ extern char buildid_dir[];
86extern char tracing_path[]; 86extern char tracing_path[];
87extern char tracing_events_path[]; 87extern char tracing_events_path[];
88extern void perf_debugfs_set_path(const char *mountpoint); 88extern void perf_debugfs_set_path(const char *mountpoint);
89const char *perf_debugfs_mount(const char *mountpoint); 89const char *perf_debugfs_mount(void);
90char *get_tracing_file(const char *name); 90char *get_tracing_file(const char *name);
91void put_tracing_file(char *file); 91void put_tracing_file(char *file);
92 92