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>

diff --git a/tools/perf/perf.c b/tools/perf/perf.c
index 07dbff5c0e60ea10b0c330b194e234666b84f6c5..f500a4b4072296127222208d0e79cfecfa4d0529 100644 (file)
--- a/tools/perf/perf.c
+++ b/tools/perf/perf.c
@@ -518,7 +518,7 @@ int main(int argc, const char **argv)
        if (!cmd)
                cmd = "perf-help";
        /* get debugfs mount point from /proc/mounts */
-       perf_debugfs_mount(NULL);
+       perf_debugfs_mount();
        /*
         * "perf-xxxx" is the same as "perf xxxx", but we obviously:
         *

diff --git a/tools/perf/util/util.c b/tools/perf/util/util.c
index 7acafb3c5592d60501561986b1812fb6b121f271..74f71f8afcc2e2c6ef30745233994a7e00ab001a 100644 (file)
--- 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)
                 mountpoint, tracing, "events");
 }
 
-static const char *__perf_tracefs_mount(const char *mountpoint)
+static const char *__perf_tracefs_mount(void)
 {
        const char *mnt;
 
-       mnt = tracefs_mount(mountpoint);
+       mnt = tracefs_mount(NULL);
        if (!mnt)
                return NULL;
 
@@ -411,11 +411,11 @@ static const char *__perf_tracefs_mount(const char *mountpoint)
        return mnt;
 }
 
-static const char *__perf_debugfs_mount(const char *mountpoint)
+static const char *__perf_debugfs_mount(void)
 {
        const char *mnt;
 
-       mnt = debugfs_mount(mountpoint);
+       mnt = debugfs_mount(NULL);
        if (!mnt)
                return NULL;
 
@@ -424,15 +424,15 @@ static const char *__perf_debugfs_mount(const char *mountpoint)
        return mnt;
 }
 
-const char *perf_debugfs_mount(const char *mountpoint)
+const char *perf_debugfs_mount(void)
 {
        const char *mnt;
 
-       mnt = __perf_tracefs_mount(mountpoint);
+       mnt = __perf_tracefs_mount();
        if (mnt)
                return mnt;
 
-       mnt = __perf_debugfs_mount(mountpoint);
+       mnt = __perf_debugfs_mount();
 
        return mnt;
 }

diff --git a/tools/perf/util/util.h b/tools/perf/util/util.h
index 09c1a8b7b4c21643afa3526c8d9a94a9545c695f..48ec232b6f66273d05bdf1a377737737cba44efd 100644 (file)
--- a/tools/perf/util/util.h
+++ b/tools/perf/util/util.h
@@ -86,7 +86,7 @@ extern char buildid_dir[];
 extern char tracing_path[];
 extern char tracing_events_path[];
 extern void perf_debugfs_set_path(const char *mountpoint);
-const char *perf_debugfs_mount(const char *mountpoint);
+const char *perf_debugfs_mount(void);
 char *get_tracing_file(const char *name);
 void put_tracing_file(char *file);