perf tools: Stop using 'self' in pstack

As suggested by tglx long ago.

Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-zgcldbjno41jn02b15760k4p@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/util/pstack.c b/tools/perf/util/pstack.c
index 13d36faf64eb4da3e2bed21813f0d791550f5053..daa17aeb6c634726381b9617f3b1b003dbc7ef21 100644 (file)
--- a/tools/perf/util/pstack.c
+++ b/tools/perf/util/pstack.c
@@ -17,59 +17,59 @@ struct pstack {
 
 struct pstack *pstack__new(unsigned short max_nr_entries)
 {
-       struct pstack *self = zalloc((sizeof(*self) +
-                                    max_nr_entries * sizeof(void *)));
-       if (self != NULL)
-               self->max_nr_entries = max_nr_entries;
-       return self;
+       struct pstack *pstack = zalloc((sizeof(*pstack) +
+                                      max_nr_entries * sizeof(void *)));
+       if (pstack != NULL)
+               pstack->max_nr_entries = max_nr_entries;
+       return pstack;
 }
 
-void pstack__delete(struct pstack *self)
+void pstack__delete(struct pstack *pstack)
 {
-       free(self);
+       free(pstack);
 }
 
-bool pstack__empty(const struct pstack *self)
+bool pstack__empty(const struct pstack *pstack)
 {
-       return self->top == 0;
+       return pstack->top == 0;
 }
 
-void pstack__remove(struct pstack *self, void *key)
+void pstack__remove(struct pstack *pstack, void *key)
 {
-       unsigned short i = self->top, last_index = self->top - 1;
+       unsigned short i = pstack->top, last_index = pstack->top - 1;
 
        while (i-- != 0) {
-               if (self->entries[i] == key) {
+               if (pstack->entries[i] == key) {
                        if (i < last_index)
-                               memmove(self->entries + i,
-                                       self->entries + i + 1,
+                               memmove(pstack->entries + i,
+                                       pstack->entries + i + 1,
                                        (last_index - i) * sizeof(void *));
-                       --self->top;
+                       --pstack->top;
                        return;
                }
        }
        pr_err("%s: %p not on the pstack!\n", __func__, key);
 }
 
-void pstack__push(struct pstack *self, void *key)
+void pstack__push(struct pstack *pstack, void *key)
 {
-       if (self->top == self->max_nr_entries) {
-               pr_err("%s: top=%d, overflow!\n", __func__, self->top);
+       if (pstack->top == pstack->max_nr_entries) {
+               pr_err("%s: top=%d, overflow!\n", __func__, pstack->top);
                return;
        }
-       self->entries[self->top++] = key;
+       pstack->entries[pstack->top++] = key;
 }
 
-void *pstack__pop(struct pstack *self)
+void *pstack__pop(struct pstack *pstack)
 {
        void *ret;
 
-       if (self->top == 0) {
+       if (pstack->top == 0) {
                pr_err("%s: underflow!\n", __func__);
                return NULL;
        }
 
-       ret = self->entries[--self->top];
-       self->entries[self->top] = NULL;
+       ret = pstack->entries[--pstack->top];
+       pstack->entries[pstack->top] = NULL;
        return ret;
 }