diff options
Diffstat (limited to 'post')
| -rw-r--r-- | post/board/lwmon/sysmon.c | 2 | ||||
| -rw-r--r-- | post/cpu/mpc8xx/ether.c | 4 | ||||
| -rw-r--r-- | post/cpu/mpc8xx/spr.c | 3 | ||||
| -rw-r--r-- | post/cpu/mpc8xx/uart.c | 4 | ||||
| -rw-r--r-- | post/cpu/ppc4xx/spr.c | 3 | ||||
| -rw-r--r-- | post/drivers/memory.c | 2 | ||||
| -rw-r--r-- | post/lib_powerpc/andi.c | 3 | ||||
| -rw-r--r-- | post/lib_powerpc/cmp.c | 3 | ||||
| -rw-r--r-- | post/lib_powerpc/cmpi.c | 3 | ||||
| -rw-r--r-- | post/lib_powerpc/cr.c | 12 | ||||
| -rw-r--r-- | post/lib_powerpc/fpu/mul-subnormal-single-1.c | 2 | ||||
| -rw-r--r-- | post/lib_powerpc/load.c | 3 | ||||
| -rw-r--r-- | post/lib_powerpc/multi.c | 2 | ||||
| -rw-r--r-- | post/lib_powerpc/rlwimi.c | 3 | ||||
| -rw-r--r-- | post/lib_powerpc/rlwinm.c | 3 | ||||
| -rw-r--r-- | post/lib_powerpc/rlwnm.c | 3 | ||||
| -rw-r--r-- | post/lib_powerpc/srawi.c | 3 | ||||
| -rw-r--r-- | post/lib_powerpc/store.c | 3 | ||||
| -rw-r--r-- | post/lib_powerpc/three.c | 3 | ||||
| -rw-r--r-- | post/lib_powerpc/threei.c | 3 | ||||
| -rw-r--r-- | post/lib_powerpc/threex.c | 3 | ||||
| -rw-r--r-- | post/lib_powerpc/two.c | 3 | ||||
| -rw-r--r-- | post/lib_powerpc/twox.c | 3 | ||||
| -rw-r--r-- | post/post.c | 2 | ||||
| -rw-r--r-- | post/tests.c | 2 | 
25 files changed, 28 insertions, 52 deletions
| diff --git a/post/board/lwmon/sysmon.c b/post/board/lwmon/sysmon.c index fc828b2e5..72224c6ef 100644 --- a/post/board/lwmon/sysmon.c +++ b/post/board/lwmon/sysmon.c @@ -133,7 +133,7 @@ static sysmon_table_t sysmon_table[] =      {"+ 5 V standby", "V", &sysmon_pic, NULL, NULL,       100, 1000, 0, 6040, 0xFF, 0xC8, 0xDE, 0, 0xC8, 0xDE, 0, 0x7C},  }; -static int sysmon_table_size = sizeof(sysmon_table) / sizeof(sysmon_table[0]); +static int sysmon_table_size = ARRAY_SIZE(sysmon_table);  static int conversion_done = 0; diff --git a/post/cpu/mpc8xx/ether.c b/post/cpu/mpc8xx/ether.c index 43ea81772..fcbb30067 100644 --- a/post/cpu/mpc8xx/ether.c +++ b/post/cpu/mpc8xx/ether.c @@ -67,8 +67,6 @@ static int ctlr_list[][2] = { {CTLR_SCC, 1} };  static int ctlr_list[][2] = { };  #endif -#define CTRL_LIST_SIZE (sizeof(ctlr_list) / sizeof(ctlr_list[0])) -  static struct {  	void (*init) (int index);  	void (*halt) (int index); @@ -618,7 +616,7 @@ int ether_post_test (int flags)  	ctlr_proc[CTLR_SCC].send = scc_send;  	ctlr_proc[CTLR_SCC].recv = scc_recv; -	for (i = 0; i < CTRL_LIST_SIZE; i++) { +	for (i = 0; i < ARRAY_SIZE(ctlr_list); i++) {  		if (test_ctlr (ctlr_list[i][0], ctlr_list[i][1]) != 0) {  			res = -1;  		} diff --git a/post/cpu/mpc8xx/spr.c b/post/cpu/mpc8xx/spr.c index db84dbe50..4c1e2afbf 100644 --- a/post/cpu/mpc8xx/spr.c +++ b/post/cpu/mpc8xx/spr.c @@ -108,8 +108,7 @@ static struct  	{826,	"MD_DBRAM1",	0x00000000,	0x00000000},  }; -static int spr_test_list_size = -		sizeof (spr_test_list) / sizeof (spr_test_list[0]); +static int spr_test_list_size = ARRAY_SIZE(spr_test_list);  int spr_post_test (int flags)  { diff --git a/post/cpu/mpc8xx/uart.c b/post/cpu/mpc8xx/uart.c index f351ac06d..7a7a62aa0 100644 --- a/post/cpu/mpc8xx/uart.c +++ b/post/cpu/mpc8xx/uart.c @@ -61,8 +61,6 @@ static int ctlr_list[][2] =  static int ctlr_list[][2] = { };  #endif -#define CTRL_LIST_SIZE (sizeof(ctlr_list) / sizeof(ctlr_list[0])) -  static struct {  	void (*init) (int index);  	void (*halt) (int index); @@ -540,7 +538,7 @@ int uart_post_test (int flags)  	ctlr_proc[CTLR_SCC].putc = scc_putc;  	ctlr_proc[CTLR_SCC].getc = scc_getc; -	for (i = 0; i < CTRL_LIST_SIZE; i++) { +	for (i = 0; i < ARRAY_SIZE(ctlr_list); i++) {  		if (test_ctlr (ctlr_list[i][0], ctlr_list[i][1]) != 0) {  			res = -1;  		} diff --git a/post/cpu/ppc4xx/spr.c b/post/cpu/ppc4xx/spr.c index cb18b6436..3f5e96593 100644 --- a/post/cpu/ppc4xx/spr.c +++ b/post/cpu/ppc4xx/spr.c @@ -156,8 +156,7 @@ static struct {  	{0x3f3,	"DBDR",		0x00000000,	0x00000000},  }; -static int spr_test_list_size = -		sizeof (spr_test_list) / sizeof (spr_test_list[0]); +static int spr_test_list_size = ARRAY_SIZE(spr_test_list);  int spr_post_test (int flags)  { diff --git a/post/drivers/memory.c b/post/drivers/memory.c index 3f47449f1..4cca03578 100644 --- a/post/drivers/memory.c +++ b/post/drivers/memory.c @@ -225,7 +225,7 @@ const unsigned long long otherpattern = 0x0123456789abcdefULL;  static int memory_post_dataline(unsigned long long * pmem)  {  	unsigned long long temp64 = 0; -	int num_patterns = sizeof(pattern)/ sizeof(pattern[0]); +	int num_patterns = ARRAY_SIZE(pattern);  	int i;  	unsigned int hi, lo, pathi, patlo;  	int ret = 0; diff --git a/post/lib_powerpc/andi.c b/post/lib_powerpc/andi.c index 52ec7c4d4..2791cd73b 100644 --- a/post/lib_powerpc/andi.c +++ b/post/lib_powerpc/andi.c @@ -61,8 +61,7 @@ static struct cpu_post_andi_s  	0x80000000      },  }; -static unsigned int cpu_post_andi_size = -    sizeof (cpu_post_andi_table) / sizeof (struct cpu_post_andi_s); +static unsigned int cpu_post_andi_size = ARRAY_SIZE(cpu_post_andi_table);  int cpu_post_test_andi (void)  { diff --git a/post/lib_powerpc/cmp.c b/post/lib_powerpc/cmp.c index 5f6a3b904..ae5b72b2c 100644 --- a/post/lib_powerpc/cmp.c +++ b/post/lib_powerpc/cmp.c @@ -95,8 +95,7 @@ static struct cpu_post_cmp_s  	0x04      },  }; -static unsigned int cpu_post_cmp_size = -    sizeof (cpu_post_cmp_table) / sizeof (struct cpu_post_cmp_s); +static unsigned int cpu_post_cmp_size = ARRAY_SIZE(cpu_post_cmp_table);  int cpu_post_test_cmp (void)  { diff --git a/post/lib_powerpc/cmpi.c b/post/lib_powerpc/cmpi.c index 1a2fc3d09..4160a2aaa 100644 --- a/post/lib_powerpc/cmpi.c +++ b/post/lib_powerpc/cmpi.c @@ -95,8 +95,7 @@ static struct cpu_post_cmpi_s  	0x04      },  }; -static unsigned int cpu_post_cmpi_size = -    sizeof (cpu_post_cmpi_table) / sizeof (struct cpu_post_cmpi_s); +static unsigned int cpu_post_cmpi_size = ARRAY_SIZE(cpu_post_cmpi_table);  int cpu_post_test_cmpi (void)  { diff --git a/post/lib_powerpc/cr.c b/post/lib_powerpc/cr.c index fbee6d5c4..ada7c7af2 100644 --- a/post/lib_powerpc/cr.c +++ b/post/lib_powerpc/cr.c @@ -59,8 +59,7 @@ static ulong cpu_post_cr_table1[] =      0xaaaaaaaa,      0x55555555,  }; -static unsigned int cpu_post_cr_size1 = -    sizeof (cpu_post_cr_table1) / sizeof (ulong); +static unsigned int cpu_post_cr_size1 = ARRAY_SIZE(cpu_post_cr_table1);  static struct cpu_post_cr_s2 {      ulong xer; @@ -76,8 +75,7 @@ static struct cpu_post_cr_s2 {  	5      },  }; -static unsigned int cpu_post_cr_size2 = -    sizeof (cpu_post_cr_table2) / sizeof (struct cpu_post_cr_s2); +static unsigned int cpu_post_cr_size2 = ARRAY_SIZE(cpu_post_cr_table2);  static struct cpu_post_cr_s3 {      ulong cr; @@ -99,8 +97,7 @@ static struct cpu_post_cr_s3 {  	0x71234567      },  }; -static unsigned int cpu_post_cr_size3 = -    sizeof (cpu_post_cr_table3) / sizeof (struct cpu_post_cr_s3); +static unsigned int cpu_post_cr_size3 = ARRAY_SIZE(cpu_post_cr_table3);  static struct cpu_post_cr_s4 {      ulong cmd; @@ -240,8 +237,7 @@ static struct cpu_post_cr_s4 {  	0x0000ffff      },  }; -static unsigned int cpu_post_cr_size4 = -    sizeof (cpu_post_cr_table4) / sizeof (struct cpu_post_cr_s4); +static unsigned int cpu_post_cr_size4 = ARRAY_SIZE(cpu_post_cr_table4);  int cpu_post_test_cr (void)  { diff --git a/post/lib_powerpc/fpu/mul-subnormal-single-1.c b/post/lib_powerpc/fpu/mul-subnormal-single-1.c index 23a3f302e..b3f8deb34 100644 --- a/post/lib_powerpc/fpu/mul-subnormal-single-1.c +++ b/post/lib_powerpc/fpu/mul-subnormal-single-1.c @@ -86,7 +86,7 @@ int fpu_post_test_math7 (void)  {  	unsigned int i; -	for (i = 0; i < sizeof (expected) / sizeof (expected[0]); i++) +	for (i = 0; i < ARRAY_SIZE(expected); i++)  	{  		tstmul (expected[i].p1, expected[i].p2, expected[i].res);  		tstmul (expected[i].p2, expected[i].p1, expected[i].res); diff --git a/post/lib_powerpc/load.c b/post/lib_powerpc/load.c index 98d437318..49924f2ed 100644 --- a/post/lib_powerpc/load.c +++ b/post/lib_powerpc/load.c @@ -171,8 +171,7 @@ static struct cpu_post_load_s  	1      },  }; -static unsigned int cpu_post_load_size = -    sizeof (cpu_post_load_table) / sizeof (struct cpu_post_load_s); +static unsigned int cpu_post_load_size = ARRAY_SIZE(cpu_post_load_table);  int cpu_post_test_load (void)  { diff --git a/post/lib_powerpc/multi.c b/post/lib_powerpc/multi.c index e42a7c07e..584561684 100644 --- a/post/lib_powerpc/multi.c +++ b/post/lib_powerpc/multi.c @@ -57,7 +57,7 @@ int cpu_post_test_multi (void)  	    ASM_BLR,  	}; -	for (i = 0; i < sizeof(src) / sizeof(src[0]); i ++) +	for (i = 0; i < ARRAY_SIZE(src); ++i)  	{  	    src[i] = i;  	    dst[i] = 0; diff --git a/post/lib_powerpc/rlwimi.c b/post/lib_powerpc/rlwimi.c index fd628b31f..15d96aca7 100644 --- a/post/lib_powerpc/rlwimi.c +++ b/post/lib_powerpc/rlwimi.c @@ -62,8 +62,7 @@ static struct cpu_post_rlwimi_s  	0xffaaffff      },  }; -static unsigned int cpu_post_rlwimi_size = -    sizeof (cpu_post_rlwimi_table) / sizeof (struct cpu_post_rlwimi_s); +static unsigned int cpu_post_rlwimi_size = ARRAY_SIZE(cpu_post_rlwimi_table);  int cpu_post_test_rlwimi (void)  { diff --git a/post/lib_powerpc/rlwinm.c b/post/lib_powerpc/rlwinm.c index 88a28c643..a04ec5271 100644 --- a/post/lib_powerpc/rlwinm.c +++ b/post/lib_powerpc/rlwinm.c @@ -59,8 +59,7 @@ static struct cpu_post_rlwinm_s  	0x0000ff00     },  }; -static unsigned int cpu_post_rlwinm_size = -    sizeof (cpu_post_rlwinm_table) / sizeof (struct cpu_post_rlwinm_s); +static unsigned int cpu_post_rlwinm_size = ARRAY_SIZE(cpu_post_rlwinm_table);  int cpu_post_test_rlwinm (void)  { diff --git a/post/lib_powerpc/rlwnm.c b/post/lib_powerpc/rlwnm.c index 60bcb6d26..764fe0c5d 100644 --- a/post/lib_powerpc/rlwnm.c +++ b/post/lib_powerpc/rlwnm.c @@ -60,8 +60,7 @@ static struct cpu_post_rlwnm_s  	0x0000ff00     },  }; -static unsigned int cpu_post_rlwnm_size = -    sizeof (cpu_post_rlwnm_table) / sizeof (struct cpu_post_rlwnm_s); +static unsigned int cpu_post_rlwnm_size = ARRAY_SIZE(cpu_post_rlwnm_table);  int cpu_post_test_rlwnm (void)  { diff --git a/post/lib_powerpc/srawi.c b/post/lib_powerpc/srawi.c index be153aded..90a1e4daa 100644 --- a/post/lib_powerpc/srawi.c +++ b/post/lib_powerpc/srawi.c @@ -61,8 +61,7 @@ static struct cpu_post_srawi_s  	0xf0000000      },  }; -static unsigned int cpu_post_srawi_size = -    sizeof (cpu_post_srawi_table) / sizeof (struct cpu_post_srawi_s); +static unsigned int cpu_post_srawi_size = ARRAY_SIZE(cpu_post_srawi_table);  int cpu_post_test_srawi (void)  { diff --git a/post/lib_powerpc/store.c b/post/lib_powerpc/store.c index 1956f6baa..441389cf4 100644 --- a/post/lib_powerpc/store.c +++ b/post/lib_powerpc/store.c @@ -156,8 +156,7 @@ static struct cpu_post_store_s  	0xff      },  }; -static unsigned int cpu_post_store_size = -    sizeof (cpu_post_store_table) / sizeof (struct cpu_post_store_s); +static unsigned int cpu_post_store_size = ARRAY_SIZE(cpu_post_store_table);  int cpu_post_test_store (void)  { diff --git a/post/lib_powerpc/three.c b/post/lib_powerpc/three.c index 7f8c1e2b8..4391386df 100644 --- a/post/lib_powerpc/three.c +++ b/post/lib_powerpc/three.c @@ -155,8 +155,7 @@ static struct cpu_post_three_s  	0x40      },  }; -static unsigned int cpu_post_three_size = -    sizeof (cpu_post_three_table) / sizeof (struct cpu_post_three_s); +static unsigned int cpu_post_three_size = ARRAY_SIZE(cpu_post_three_table);  int cpu_post_test_three (void)  { diff --git a/post/lib_powerpc/threei.c b/post/lib_powerpc/threei.c index 31953f935..95b632268 100644 --- a/post/lib_powerpc/threei.c +++ b/post/lib_powerpc/threei.c @@ -75,8 +75,7 @@ static struct cpu_post_threei_s  	0xffff8000      },  }; -static unsigned int cpu_post_threei_size = -    sizeof (cpu_post_threei_table) / sizeof (struct cpu_post_threei_s); +static unsigned int cpu_post_threei_size = ARRAY_SIZE(cpu_post_threei_table);  int cpu_post_test_threei (void)  { diff --git a/post/lib_powerpc/threex.c b/post/lib_powerpc/threex.c index 350a12ae7..7769218ba 100644 --- a/post/lib_powerpc/threex.c +++ b/post/lib_powerpc/threex.c @@ -125,8 +125,7 @@ static struct cpu_post_threex_s  	0x1000      },  }; -static unsigned int cpu_post_threex_size = -    sizeof (cpu_post_threex_table) / sizeof (struct cpu_post_threex_s); +static unsigned int cpu_post_threex_size = ARRAY_SIZE(cpu_post_threex_table);  int cpu_post_test_threex (void)  { diff --git a/post/lib_powerpc/two.c b/post/lib_powerpc/two.c index 2b111472b..7f0888029 100644 --- a/post/lib_powerpc/two.c +++ b/post/lib_powerpc/two.c @@ -81,8 +81,7 @@ static struct cpu_post_two_s  	~5      },  }; -static unsigned int cpu_post_two_size = -    sizeof (cpu_post_two_table) / sizeof (struct cpu_post_two_s); +static unsigned int cpu_post_two_size = ARRAY_SIZE(cpu_post_two_table);  int cpu_post_test_two (void)  { diff --git a/post/lib_powerpc/twox.c b/post/lib_powerpc/twox.c index d6714f986..88140bf2f 100644 --- a/post/lib_powerpc/twox.c +++ b/post/lib_powerpc/twox.c @@ -81,8 +81,7 @@ static struct cpu_post_twox_s  	12      },  }; -static unsigned int cpu_post_twox_size = -    sizeof (cpu_post_twox_table) / sizeof (struct cpu_post_twox_s); +static unsigned int cpu_post_twox_size = ARRAY_SIZE(cpu_post_twox_table);  int cpu_post_test_twox (void)  { diff --git a/post/post.c b/post/post.c index ecea1e13a..76602243e 100644 --- a/post/post.c +++ b/post/post.c @@ -196,7 +196,7 @@ static void post_get_flags (int *test_flags)  			 POST_CRITICAL };  	char *var[] = { "post_poweron", "post_normal", "post_slowtest",  			"post_critical" }; -	int varnum = sizeof (var) / sizeof (var[0]); +	int varnum = ARRAY_SIZE(var);  	char list[128];			/* long enough for POST list */  	char *name;  	char *s; diff --git a/post/tests.c b/post/tests.c index 5f59fbb27..71437b628 100644 --- a/post/tests.c +++ b/post/tests.c @@ -305,4 +305,4 @@ struct post_test post_list[] =  #endif  }; -unsigned int post_list_size = sizeof (post_list) / sizeof (struct post_test); +unsigned int post_list_size = ARRAY_SIZE(post_list); |