[PATCH 6/6] perf tools: Remove nr_sort_keys field

[Namhyung Kim]

The nr_sort_keys field is to carry the number of sort entries in a
hpp_list or hists to determine the depth of indentation of a hist entry.
As it's only used in hierarchy mode and now we have used nr_hpp_node for
this reason, there's no need to keep it anymore.  Let's get rid of it.

Signed-off-by: Namhyung Kim <namhy...@kernel.org>
---
 tools/perf/ui/hist.c   |  3 ---
 tools/perf/util/hist.h |  2 --
 tools/perf/util/sort.c | 26 --------------------------
 3 files changed, 31 deletions(-)

diff --git a/tools/perf/ui/hist.c b/tools/perf/ui/hist.c
index f03c4f70438f..3baeaa6e71b5 100644
--- a/tools/perf/ui/hist.c
+++ b/tools/perf/ui/hist.c
@@ -515,9 +515,6 @@ void perf_hpp_list__column_register(struct perf_hpp_list 
*list,
 void perf_hpp_list__register_sort_field(struct perf_hpp_list *list,
                                        struct perf_hpp_fmt *format)
 {
-       if (perf_hpp__is_sort_entry(format) || 
perf_hpp__is_dynamic_entry(format))
-               list->nr_sort_keys++;
-
        list_add_tail(&format->sort_list, &list->sorts);
 }
 
diff --git a/tools/perf/util/hist.h b/tools/perf/util/hist.h
index 6870a1bfd762..ead18c82294f 100644
--- a/tools/perf/util/hist.h
+++ b/tools/perf/util/hist.h
@@ -79,7 +79,6 @@ struct hists {
        int                     socket_filter;
        struct perf_hpp_list    *hpp_list;
        struct list_head        hpp_formats;
-       int                     nr_sort_keys;
        int                     nr_hpp_node;
 };
 
@@ -241,7 +240,6 @@ struct perf_hpp_fmt {
 struct perf_hpp_list {
        struct list_head fields;
        struct list_head sorts;
-       int nr_sort_keys;
 };
 
 extern struct perf_hpp_list perf_hpp_list;
diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
index 6bb831ddc6a7..be5fcb25496a 100644
--- a/tools/perf/util/sort.c
+++ b/tools/perf/util/sort.c
@@ -2695,29 +2695,6 @@ out:
        return ret;
 }
 
-static void evlist__set_hists_nr_sort_keys(struct perf_evlist *evlist)
-{
-       struct perf_evsel *evsel;
-
-       evlist__for_each(evlist, evsel) {
-               struct perf_hpp_fmt *fmt;
-               struct hists *hists = evsel__hists(evsel);
-
-               hists->nr_sort_keys = perf_hpp_list.nr_sort_keys;
-
-               /*
-                * If dynamic entries were used, it might add multiple
-                * entries to each evsel for a single field name.  Set
-                * actual number of sort keys for each hists.
-                */
-               perf_hpp_list__for_each_sort_list(&perf_hpp_list, fmt) {
-                       if (perf_hpp__is_dynamic_entry(fmt) &&
-                           !perf_hpp__defined_dynamic_entry(fmt, hists))
-                               hists->nr_sort_keys--;
-               }
-       }
-}
-
 int setup_sorting(struct perf_evlist *evlist)
 {
        int err;
@@ -2732,9 +2709,6 @@ int setup_sorting(struct perf_evlist *evlist)
                        return err;
        }
 
-       if (evlist != NULL)
-               evlist__set_hists_nr_sort_keys(evlist);
-
        reset_dimensions();
 
        /*
-- 
2.7.2