[PATCH 12/23] perf tools: Use ARRAY_SIZE in mem sort display functions

[Jiri Olsa]

There's no need to define extra macros for that.

Link: http://lkml.kernel.org/n/tip-ib5fkxt3i5bp1pi9ym6et...@git.kernel.org
Signed-off-by: Jiri Olsa <jo...@kernel.org>
---
 tools/perf/util/sort.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
index 3305149326bb..5cb3e13b8f2e 100644
--- a/tools/perf/util/sort.c
+++ b/tools/perf/util/sort.c
@@ -843,7 +843,6 @@ static const char * const tlb_access[] = {
        "Walker",
        "Fault",
 };
-#define NUM_TLB_ACCESS (sizeof(tlb_access)/sizeof(const char *))
 
 static int hist_entry__tlb_snprintf(struct hist_entry *he, char *bf,
                                    size_t size, unsigned int width)
@@ -865,7 +864,7 @@ static int hist_entry__tlb_snprintf(struct hist_entry *he, 
char *bf,
        /* already taken care of */
        m &= ~(PERF_MEM_TLB_HIT|PERF_MEM_TLB_MISS);
 
-       for (i = 0; m && i < NUM_TLB_ACCESS; i++, m >>= 1) {
+       for (i = 0; m && i < ARRAY_SIZE(tlb_access); i++, m >>= 1) {
                if (!(m & 0x1))
                        continue;
                if (l) {
@@ -920,7 +919,6 @@ static const char * const mem_lvl[] = {
        "I/O",
        "Uncached",
 };
-#define NUM_MEM_LVL (sizeof(mem_lvl)/sizeof(const char *))
 
 static int hist_entry__lvl_snprintf(struct hist_entry *he, char *bf,
                                    size_t size, unsigned int width)
@@ -942,7 +940,7 @@ static int hist_entry__lvl_snprintf(struct hist_entry *he, 
char *bf,
        /* already taken care of */
        m &= ~(PERF_MEM_LVL_HIT|PERF_MEM_LVL_MISS);
 
-       for (i = 0; m && i < NUM_MEM_LVL; i++, m >>= 1) {
+       for (i = 0; m && i < ARRAY_SIZE(mem_lvl); i++, m >>= 1) {
                if (!(m & 0x1))
                        continue;
                if (l) {
@@ -988,7 +986,6 @@ static const char * const snoop_access[] = {
        "Hit",
        "HitM",
 };
-#define NUM_SNOOP_ACCESS (sizeof(snoop_access)/sizeof(const char *))
 
 static int hist_entry__snoop_snprintf(struct hist_entry *he, char *bf,
                                    size_t size, unsigned int width)
@@ -1003,7 +1000,7 @@ static int hist_entry__snoop_snprintf(struct hist_entry 
*he, char *bf,
        if (he->mem_info)
                m = he->mem_info->data_src.mem_snoop;
 
-       for (i = 0; m && i < NUM_SNOOP_ACCESS; i++, m >>= 1) {
+       for (i = 0; m && i < ARRAY_SIZE(snoop_access); i++, m >>= 1) {
                if (!(m & 0x1))
                        continue;
                if (l) {
-- 
2.4.3