1 files changed, 8 insertions, 26 deletions

diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h
index 1ea7c92..4a7bdc7 100644
--- a/tools/perf/util/evsel.h
+++ b/tools/perf/util/evsel.h
@@ -74,7 +74,10 @@ struct perf_evsel {
 		off_t		id_offset;
 	};
 	struct cgroup_sel	*cgrp;
-	void			*handler;
+	struct {
+		void		*func;
+		void		*data;
+	} handler;
 	struct cpu_map		*cpus;
 	unsigned int		sample_size;
 	int			id_pos;
@@ -96,19 +99,8 @@ struct thread_map;
 struct perf_evlist;
 struct perf_record_opts;
 
-struct perf_evsel *perf_evsel__new_idx(struct perf_event_attr *attr, int idx);
-
-static inline struct perf_evsel *perf_evsel__new(struct perf_event_attr *attr)
-{
-	return perf_evsel__new_idx(attr, 0);
-}
-
-struct perf_evsel *perf_evsel__newtp_idx(const char *sys, const char *name, int idx);
-
-static inline struct perf_evsel *perf_evsel__newtp(const char *sys, const char *name)
-{
-	return perf_evsel__newtp_idx(sys, name, 0);
-}
+struct perf_evsel *perf_evsel__new(struct perf_event_attr *attr, int idx);
+struct perf_evsel *perf_evsel__newtp(const char *sys, const char *name, int idx);
 
 struct event_format *event_format__new(const char *sys, const char *name);
 
@@ -205,12 +197,6 @@ static inline bool perf_evsel__match2(struct perf_evsel *e1,
 	       (e1->attr.config == e2->attr.config);
 }
 
-#define perf_evsel__cmp(a, b)			\
-	((a) &&					\
-	 (b) &&					\
-	 (a)->attr.type == (b)->attr.type &&	\
-	 (a)->attr.config == (b)->attr.config)
-
 int __perf_evsel__read_on_cpu(struct perf_evsel *evsel,
 			      int cpu, int thread, bool scale);
 
@@ -279,11 +265,6 @@ static inline struct perf_evsel *perf_evsel__next(struct perf_evsel *evsel)
 	return list_entry(evsel->node.next, struct perf_evsel, node);
 }
 
-static inline struct perf_evsel *perf_evsel__prev(struct perf_evsel *evsel)
-{
-	return list_entry(evsel->node.prev, struct perf_evsel, node);
-}
-
 /**
  * perf_evsel__is_group_leader - Return whether given evsel is a leader event
  *
@@ -323,7 +304,8 @@ int perf_evsel__fprintf(struct perf_evsel *evsel,
 
 bool perf_evsel__fallback(struct perf_evsel *evsel, int err,
 			  char *msg, size_t msgsize);
-int perf_evsel__open_strerror(struct perf_evsel *evsel, struct target *target,
+int perf_evsel__open_strerror(struct perf_evsel *evsel,
+			      struct perf_target *target,
 			      int err, char *msg, size_t size);
 
 static inline int perf_evsel__group_idx(struct perf_evsel *evsel)