perf tools: Remove unused functions from debugfs object

Following debugfs object functions are not referenced
within the code:

  int debugfs_valid_entry(const char *path);
  int debugfs_umount(void);
  int debugfs_write(const char *entry, const char *value);
  int debugfs_read(const char *entry, char *buffer, size_t size);
  void debugfs_force_cleanup(void);
  int debugfs_make_path(const char *element, char *buffer, int size);

Removing them.

Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1327674868-10486-3-git-send-email-jolsa@redhat.com
Signed-off-by: Jiri Olsa <jolsa@redhat.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/util/debugfs.c b/tools/perf/util/debugfs.c
index ffc35e7..dd8b193 100644 (file)
--- a/tools/perf/util/debugfs.c
+++ b/tools/perf/util/debugfs.c
@@ -15,32 +15,6 @@ static const char *debugfs_known_mountpoints[] = {
        0,
 };
 
-/* use this to force a umount */
-void debugfs_force_cleanup(void)
-{
-       debugfs_find_mountpoint();
-       debugfs_premounted = 0;
-       debugfs_umount();
-}
-
-/* construct a full path to a debugfs element */
-int debugfs_make_path(const char *element, char *buffer, int size)
-{
-       int len;
-
-       if (strlen(debugfs_mountpoint) == 0) {
-               buffer[0] = '\0';
-               return -1;
-       }
-
-       len = strlen(debugfs_mountpoint) + strlen(element) + 1;
-       if (len >= size)
-               return len+1;
-
-       snprintf(buffer, size-1, "%s/%s", debugfs_mountpoint, element);
-       return 0;
-}
-
 static int debugfs_found;
 
 /* find the path to the mounted debugfs */
@@ -97,17 +71,6 @@ int debugfs_valid_mountpoint(const char *debugfs)
        return 0;
 }
 
-
-int debugfs_valid_entry(const char *path)
-{
-       struct stat st;
-
-       if (stat(path, &st))
-               return -errno;
-
-       return 0;
-}
-
 static void debugfs_set_tracing_events_path(const char *mountpoint)
 {
        snprintf(tracing_events_path, sizeof(tracing_events_path), "%s/%s",
@@ -149,107 +112,3 @@ void debugfs_set_path(const char *mountpoint)
        snprintf(debugfs_mountpoint, sizeof(debugfs_mountpoint), "%s", mountpoint);
        debugfs_set_tracing_events_path(mountpoint);
 }
-
-/* umount the debugfs */
-
-int debugfs_umount(void)
-{
-       char umountcmd[128];
-       int ret;
-
-       /* if it was already mounted, leave it */
-       if (debugfs_premounted)
-               return 0;
-
-       /* make sure it's a valid mount point */
-       ret = debugfs_valid_mountpoint(debugfs_mountpoint);
-       if (ret)
-               return ret;
-
-       snprintf(umountcmd, sizeof(umountcmd),
-                "/bin/umount %s", debugfs_mountpoint);
-       return system(umountcmd);
-}
-
-int debugfs_write(const char *entry, const char *value)
-{
-       char path[PATH_MAX + 1];
-       int ret, count;
-       int fd;
-
-       /* construct the path */
-       snprintf(path, sizeof(path), "%s/%s", debugfs_mountpoint, entry);
-
-       /* verify that it exists */
-       ret = debugfs_valid_entry(path);
-       if (ret)
-               return ret;
-
-       /* get how many chars we're going to write */
-       count = strlen(value);
-
-       /* open the debugfs entry */
-       fd = open(path, O_RDWR);
-       if (fd < 0)
-               return -errno;
-
-       while (count > 0) {
-               /* write it */
-               ret = write(fd, value, count);
-               if (ret <= 0) {
-                       if (ret == EAGAIN)
-                               continue;
-                       close(fd);
-                       return -errno;
-               }
-               count -= ret;
-       }
-
-       /* close it */
-       close(fd);
-
-       /* return success */
-       return 0;
-}
-
-/*
- * read a debugfs entry
- * returns the number of chars read or a negative errno
- */
-int debugfs_read(const char *entry, char *buffer, size_t size)
-{
-       char path[PATH_MAX + 1];
-       int ret;
-       int fd;
-
-       /* construct the path */
-       snprintf(path, sizeof(path), "%s/%s", debugfs_mountpoint, entry);
-
-       /* verify that it exists */
-       ret = debugfs_valid_entry(path);
-       if (ret)
-               return ret;
-
-       /* open the debugfs entry */
-       fd = open(path, O_RDONLY);
-       if (fd < 0)
-               return -errno;
-
-       do {
-               /* read it */
-               ret = read(fd, buffer, size);
-               if (ret == 0) {
-                       close(fd);
-                       return EOF;
-               }
-       } while (ret < 0 && errno == EAGAIN);
-
-       /* close it */
-       close(fd);
-
-       /* make *sure* there's a null character at the end */
-       buffer[ret] = '\0';
-
-       /* return the number of chars read */
-       return ret;
-}

diff --git a/tools/perf/util/debugfs.h b/tools/perf/util/debugfs.h
index 4a878f7..68f3e87 100644 (file)
--- a/tools/perf/util/debugfs.h
+++ b/tools/perf/util/debugfs.h
@@ -3,14 +3,8 @@
 
 const char *debugfs_find_mountpoint(void);
 int debugfs_valid_mountpoint(const char *debugfs);
-int debugfs_valid_entry(const char *path);
 char *debugfs_mount(const char *mountpoint);
-int debugfs_umount(void);
 void debugfs_set_path(const char *mountpoint);
-int debugfs_write(const char *entry, const char *value);
-int debugfs_read(const char *entry, char *buffer, size_t size);
-void debugfs_force_cleanup(void);
-int debugfs_make_path(const char *element, char *buffer, int size);
 
 extern char debugfs_mountpoint[];
 extern char tracing_events_path[];