[PATCH 2/2] perf thread-stack: Eliminate code duplicating thread_stack__pop_ks()

[Adrian Hunter]

Use new function thread_stack__pop_ks() in place of equivalent code.

Signed-off-by: Adrian Hunter <adrian.hun...@intel.com>
---
 tools/perf/util/thread-stack.c | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/tools/perf/util/thread-stack.c b/tools/perf/util/thread-stack.c
index f91c00dfe23b..b20c9b867fce 100644
--- a/tools/perf/util/thread-stack.c
+++ b/tools/perf/util/thread-stack.c
@@ -673,12 +673,9 @@ static int thread_stack__no_call_return(struct thread 
*thread,
 
        if (ip >= ks && addr < ks) {
                /* Return to userspace, so pop all kernel addresses */
-               while (thread_stack__in_kernel(ts)) {
-                       err = thread_stack__call_return(thread, ts, --ts->cnt,
-                                                       tm, ref, true);
-                       if (err)
-                               return err;
-               }
+               err = thread_stack__pop_ks(thread, ts, sample, ref);
+               if (err)
+                       return err;
 
                /* If the stack is empty, push the userspace address */
                if (!ts->cnt) {
@@ -688,12 +685,9 @@ static int thread_stack__no_call_return(struct thread 
*thread,
                }
        } else if (thread_stack__in_kernel(ts) && ip < ks) {
                /* Return to userspace, so pop all kernel addresses */
-               while (thread_stack__in_kernel(ts)) {
-                       err = thread_stack__call_return(thread, ts, --ts->cnt,
-                                                       tm, ref, true);
-                       if (err)
-                               return err;
-               }
+               err = thread_stack__pop_ks(thread, ts, sample, ref);
+               if (err)
+                       return err;
        }
 
        if (ts->cnt)
-- 
2.17.1