Rewind v3.13-rc3+ (78fd82238d0e5716) to v3.12

1 files changed, 4 insertions, 19 deletions

diff --git a/tools/perf/util/intlist.c b/tools/perf/util/intlist.c
index 89715b6..11a8d86 100644
--- a/tools/perf/util/intlist.c
+++ b/tools/perf/util/intlist.c
@@ -20,7 +20,6 @@ static struct rb_node *intlist__node_new(struct rblist *rblist __maybe_unused,
 
 	if (node != NULL) {
 		node->i = i;
-		node->priv = NULL;
 		rc = &node->rb_node;
 	}
 
@@ -58,36 +57,22 @@ void intlist__remove(struct intlist *ilist, struct int_node *node)
 	rblist__remove_node(&ilist->rblist, &node->rb_node);
 }
 
-static struct int_node *__intlist__findnew(struct intlist *ilist,
-					   int i, bool create)
+struct int_node *intlist__find(struct intlist *ilist, int i)
 {
-	struct int_node *node = NULL;
+	struct int_node *node;
 	struct rb_node *rb_node;
 
 	if (ilist == NULL)
 		return NULL;
 
-	if (create)
-		rb_node = rblist__findnew(&ilist->rblist, (void *)((long)i));
-	else
-		rb_node = rblist__find(&ilist->rblist, (void *)((long)i));
-
+	node = NULL;
+	rb_node = rblist__find(&ilist->rblist, (void *)((long)i));
 	if (rb_node)
 		node = container_of(rb_node, struct int_node, rb_node);
 
 	return node;
 }
 
-struct int_node *intlist__find(struct intlist *ilist, int i)
-{
-	return __intlist__findnew(ilist, i, false);
-}
-
-struct int_node *intlist__findnew(struct intlist *ilist, int i)
-{
-	return __intlist__findnew(ilist, i, true);
-}
-
 static int intlist__parse_list(struct intlist *ilist, const char *s)
 {
 	char *sep;