From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932173AbbIHOhk (ORCPT ); Tue, 8 Sep 2015 10:37:40 -0400 Received: from terminus.zytor.com ([198.137.202.10]:52191 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755147AbbIHOdK (ORCPT ); Tue, 8 Sep 2015 10:33:10 -0400 Date: Tue, 8 Sep 2015 07:32:46 -0700 From: tip-bot for Jiri Olsa Message-ID: Cc: raphael.beamonte@gmail.com, tglx@linutronix.de, a.p.zijlstra@chello.nl, mingo@kernel.org, linux-kernel@vger.kernel.org, matt@codeblueprint.co.uk, jolsa@kernel.org, hpa@zytor.com, dsahern@gmail.com, rostedt@goodmis.org, namhyung@kernel.org, acme@redhat.com Reply-To: rostedt@goodmis.org, hpa@zytor.com, dsahern@gmail.com, acme@redhat.com, namhyung@kernel.org, a.p.zijlstra@chello.nl, mingo@kernel.org, raphael.beamonte@gmail.com, tglx@linutronix.de, matt@codeblueprint.co.uk, jolsa@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <1441180605-24737-3-git-send-email-jolsa@kernel.org> References: <1441180605-24737-3-git-send-email-jolsa@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf tools: Remove mountpoint arg from perf_debugfs_mount Git-Commit-ID: f6a09af7de3b39b1e4fcff7374871f834498b7f0 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: f6a09af7de3b39b1e4fcff7374871f834498b7f0 Gitweb: http://git.kernel.org/tip/f6a09af7de3b39b1e4fcff7374871f834498b7f0 Author: Jiri Olsa AuthorDate: Wed, 2 Sep 2015 09:56:32 +0200 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 2 Sep 2015 16:30:47 -0300 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 Cc: Raphael Beamonte Cc: David Ahern Cc: Matt Fleming Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Steven Rostedt Link: http://lkml.kernel.org/r/1441180605-24737-3-git-send-email-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/perf.c | 2 +- tools/perf/util/util.c | 14 +++++++------- tools/perf/util/util.h | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tools/perf/perf.c b/tools/perf/perf.c index 07dbff5..f500a4b 100644 --- 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 7acafb3..74f71f8 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) 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 09c1a8b..48ec232 100644 --- 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);