Merge tag 'omap-for-v3.13/fixes-for-merge-window-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

Few clock fixes, a runtime PM fix, and pinctrl-single fix along
with few other fixes that popped up during the merge window.

* tag 'omap-for-v3.13/fixes-for-merge-window-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP2+: Fix build for dra7xx without omap4 and 5
  ARM: OMAP2+: omap_device: maintain sane runtime pm status around suspend/resume
  doc: devicetree: Add bindings documentation for omap-des driver
  ARM: dts: doc: Document missing compatible property for omap-sham driver
  ARM: OMAP3: Beagle: fix return value check in beagle_opp_init()
  ARM: OMAP: devicetree: fix SPI node compatible property syntax items
  pinctrl: single: call pcs_soc->rearm() whenever IRQ mask is changed
  ARM: OMAP2+: smsc911x: fix return value check in gpmc_smsc911x_init()
  + sync with newer trunk

1 files changed, 0 insertions, 60 deletions

diff --git a/tools/perf/util/sysfs.c b/tools/perf/util/sysfs.c
deleted file mode 100644
index f71e9eafe15a..000000000000
--- a/tools/perf/util/sysfs.c
+++ /dev/null
@@ -1,60 +0,0 @@
-
-#include "util.h"
-#include "sysfs.h"
-
-static const char * const sysfs_known_mountpoints[] = {
-        "/sys",
-        0,
-};
-
-static int sysfs_found;
-char sysfs_mountpoint[PATH_MAX + 1];
-
-static int sysfs_valid_mountpoint(const char *sysfs)
-{
-        struct statfs st_fs;
-
-        if (statfs(sysfs, &st_fs) < 0)
-                return -ENOENT;
-        else if (st_fs.f_type != (long) SYSFS_MAGIC)
-                return -ENOENT;
-
-        return 0;
-}
-
-const char *sysfs_find_mountpoint(void)
-{
-        const char * const *ptr;
-        char type[100];
-        FILE *fp;
-
-        if (sysfs_found)
-                return (const char *) sysfs_mountpoint;
-
-        ptr = sysfs_known_mountpoints;
-        while (*ptr) {
-                if (sysfs_valid_mountpoint(*ptr) == 0) {
-                        sysfs_found = 1;
-                        strcpy(sysfs_mountpoint, *ptr);
-                        return sysfs_mountpoint;
-                }
-                ptr++;
-        }
-
-        /* give up and parse /proc/mounts */
-        fp = fopen("/proc/mounts", "r");
-        if (fp == NULL)
-                return NULL;
-
-        while (!sysfs_found &&
-               fscanf(fp, "%*s %" STR(PATH_MAX) "s %99s %*s %*d %*d\n",
-                      sysfs_mountpoint, type) == 2) {
-
-                if (strcmp(type, "sysfs") == 0)
-                        sysfs_found = 1;
-        }
-
-        fclose(fp);
-
-        return sysfs_found ? sysfs_mountpoint : NULL;
-}