Now that event's config2 attribute is used to communicate sink selection
to the kernel, remove the old set_drv_config() implementation since it
is no longer needed.

Signed-off-by: Mathieu Poirier <mathieu.poir...@linaro.org>
---
 tools/perf/arch/arm/util/cs-etm.c | 54 -------------------------------
 tools/perf/arch/arm/util/cs-etm.h |  3 --
 tools/perf/arch/arm/util/pmu.c    |  2 --
 3 files changed, 59 deletions(-)

diff --git a/tools/perf/arch/arm/util/cs-etm.c 
b/tools/perf/arch/arm/util/cs-etm.c
index 4aa6193dcb50..9a4a8153e4c2 100644
--- a/tools/perf/arch/arm/util/cs-etm.c
+++ b/tools/perf/arch/arm/util/cs-etm.c
@@ -26,9 +26,6 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 
-#define ENABLE_SINK_MAX        128
-#define CS_BUS_DEVICE_PATH "/bus/coresight/devices/"
-
 struct cs_etm_recording {
        struct auxtrace_record  itr;
        struct perf_pmu         *cs_etm_pmu;
@@ -638,54 +635,3 @@ struct auxtrace_record *cs_etm_record_init(int *err)
 out:
        return NULL;
 }
-
-static FILE *cs_device__open_file(const char *name)
-{
-       struct stat st;
-       char path[PATH_MAX];
-       const char *sysfs;
-
-       sysfs = sysfs__mountpoint();
-       if (!sysfs)
-               return NULL;
-
-       snprintf(path, PATH_MAX,
-                "%s" CS_BUS_DEVICE_PATH "%s", sysfs, name);
-
-       if (stat(path, &st) < 0)
-               return NULL;
-
-       return fopen(path, "w");
-
-}
-
-static int __printf(2, 3) cs_device__print_file(const char *name, const char 
*fmt, ...)
-{
-       va_list args;
-       FILE *file;
-       int ret = -EINVAL;
-
-       va_start(args, fmt);
-       file = cs_device__open_file(name);
-       if (file) {
-               ret = vfprintf(file, fmt, args);
-               fclose(file);
-       }
-       va_end(args);
-       return ret;
-}
-
-int cs_etm_set_drv_config(struct perf_evsel_config_term *term)
-{
-       int ret;
-       char enable_sink[ENABLE_SINK_MAX];
-
-       snprintf(enable_sink, ENABLE_SINK_MAX, "%s/%s",
-                term->val.drv_cfg, "enable_sink");
-
-       ret = cs_device__print_file(enable_sink, "%d", 1);
-       if (ret < 0)
-               return ret;
-
-       return 0;
-}
diff --git a/tools/perf/arch/arm/util/cs-etm.h 
b/tools/perf/arch/arm/util/cs-etm.h
index 1a12e64f5127..a3354bda4fe8 100644
--- a/tools/perf/arch/arm/util/cs-etm.h
+++ b/tools/perf/arch/arm/util/cs-etm.h
@@ -7,9 +7,6 @@
 #ifndef INCLUDE__PERF_CS_ETM_H__
 #define INCLUDE__PERF_CS_ETM_H__
 
-#include "../../util/evsel.h"
-
 struct auxtrace_record *cs_etm_record_init(int *err);
-int cs_etm_set_drv_config(struct perf_evsel_config_term *term);
 
 #endif
diff --git a/tools/perf/arch/arm/util/pmu.c b/tools/perf/arch/arm/util/pmu.c
index e047571e6080..e4619f2fe7ce 100644
--- a/tools/perf/arch/arm/util/pmu.c
+++ b/tools/perf/arch/arm/util/pmu.c
@@ -8,7 +8,6 @@
 #include <linux/coresight-pmu.h>
 #include <linux/perf_event.h>
 
-#include "cs-etm.h"
 #include "arm-spe.h"
 #include "../../util/pmu.h"
 
@@ -19,7 +18,6 @@ struct perf_event_attr
        if (!strcmp(pmu->name, CORESIGHT_ETM_PMU_NAME)) {
                /* add ETM default config here */
                pmu->selectable = true;
-               pmu->set_drv_config = cs_etm_set_drv_config;
 #if defined(__aarch64__)
        } else if (strstarts(pmu->name, ARM_SPE_PMU_NAME)) {
                return arm_spe_pmu_default_config(pmu);
-- 
2.17.1

Reply via email to