From 8cb26dc8c477509bb620850068bda6721cd521cf Mon Sep 17 00:00:00 2001
From: Arnaldo Carvalho de Melo <acme@redhat.com>
Date: Fri, 18 Jan 2013 17:03:43 -0300
Subject: [PATCH] --- yaml --- r: 349977 b: refs/heads/master c:
 be651ed98dd362fa4151f49f917c74e9e8da88ac h: refs/heads/master i:   349975:
 0e0cd20c794e1b8a1c35ffc756716c1287634ce0 v: v3

---
 [refs]                       | 2 +-
 trunk/tools/perf/tests/pmu.c | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 41ea21656dca..3357be543f2b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 23b6339b914ec009ba206584a410039b589243aa
+refs/heads/master: be651ed98dd362fa4151f49f917c74e9e8da88ac
diff --git a/trunk/tools/perf/tests/pmu.c b/trunk/tools/perf/tests/pmu.c
index 6803ed1a06dd..12b322fa3475 100644
--- a/trunk/tools/perf/tests/pmu.c
+++ b/trunk/tools/perf/tests/pmu.c
@@ -19,8 +19,6 @@ static struct test_format {
 	{ "krava23", "config2:28-29,38\n", },
 };
 
-#define TEST_FORMATS_CNT (sizeof(test_formats) / sizeof(struct test_format))
-
 /* Simulated users input. */
 static struct parse_events_term test_terms[] = {
 	{
@@ -78,7 +76,6 @@ static struct parse_events_term test_terms[] = {
 		.type_term = PARSE_EVENTS__TERM_TYPE_USER,
 	},
 };
-#define TERMS_CNT (sizeof(test_terms) / sizeof(struct parse_events_term))
 
 /*
  * Prepare format directory data, exported by kernel
@@ -93,7 +90,7 @@ static char *test_format_dir_get(void)
 	if (!mkdtemp(dir))
 		return NULL;
 
-	for (i = 0; i < TEST_FORMATS_CNT; i++) {
+	for (i = 0; i < ARRAY_SIZE(test_formats); i++) {
 		static char name[PATH_MAX];
 		struct test_format *format = &test_formats[i];
 		FILE *file;
@@ -130,14 +127,12 @@ static struct list_head *test_terms_list(void)
 	static LIST_HEAD(terms);
 	unsigned int i;
 
-	for (i = 0; i < TERMS_CNT; i++)
+	for (i = 0; i < ARRAY_SIZE(test_terms); i++)
 		list_add_tail(&test_terms[i].list, &terms);
 
 	return &terms;
 }
 
-#undef TERMS_CNT
-
 int test__pmu(void)
 {
 	char *format = test_format_dir_get();