Skip to contentSkip to conversation

arch/alpha: Use ARRAY_SIZE macro

PATCH New Tobias Klauser 1 participant 1 message Jul 19, 2006

Subsystems (2)
Kernel janitors Alpha port
lore
Share & tools
lore

Tobias Klauser

author
#0 lore raw

PATCH 1/1 arch/alpha: Use ARRAY_SIZE macro

Use ARRAY_SIZE macro instead of sizeof(x)/sizeof(x[0]) and remove a duplicate of the macro. Also remove some trailing whitespaces and needless braces.

Signed-off-by Tobias Klauser <[email protected]>
---
 arch/alpha/kernel/err_ev7.c     |    8 ++----
 arch/alpha/kernel/osf_sys.c     |    4 ++-
 arch/alpha/kernel/setup.c       |   50 +++++++++++++++++++--------------------
 arch/alpha/kernel/sys_ruffian.c |    8 +++---
 arch/alpha/kernel/time.c        |    2 +-
 5 files changed, 34 insertions(+), 38 deletions(-)
arch/alpha/kernel/err_ev7.c +3 -5
index bf52ba6..fed6b3d 100644
@@ -274,16 +274,14 @@ ev7_process_pal_subpacket(struct el_subp
 struct el_subpacket_handler ev7_pal_subpacket_handler  	SUBPACKET_HANDLER_INIT(EL_CLASS__PAL, ev7_process_pal_subpacket);
 
-void 
+void
 ev7_register_error_handlers(void)
 {
 	int i;
 
-	for(i = 0;
-	    i<sizeof(el_ev7_pal_annotations)/sizeof(el_ev7_pal_annotations[1]);
-	    i++) {
+	for (i = 0; i < ARRAY_SIZE(el_ev7_pal_annotations); i++)
 		cdl_register_subpacket_annotation(&el_ev7_pal_annotations[i]);
-	}	
+
 	cdl_register_subpacket_handler(&ev7_pal_subpacket_handler);
 }
arch/alpha/kernel/osf_sys.c +2 -2
index e15dcf4..73c7622 100644
@@ -623,12 +623,12 @@ osf_sysinfo(int command, char __user *bu
 	long len, err = -EINVAL;
 
 	offset = command-1;
-	if (offset >= sizeof(sysinfo_table)/sizeof(char *)) {
+	if (offset >= ARRAY_SIZE(sysinfo_table)) {
 		/* Digital UNIX has a few unpublished interfaces here */
 		printk("sysinfo(%d)", command);
 		goto out;
 	}
-	
+
 	down_read(&uts_sem);
 	res = sysinfo_table[offset];
 	len = strlen(res)+1;
arch/alpha/kernel/setup.c +24 -26

153 lines not on this page · raw message

arch/alpha/kernel/sys_ruffian.c +4 -4
index 78c30de..5b99cf3 100644
@@ -182,16 +182,16 @@ static unsigned long __init
 ruffian_get_bank_size(unsigned long offset)
 {
 	unsigned long bank_addr, bank, ret = 0;
-  
+
 	/* Valid offsets are: 0x800, 0x840 and 0x880
 	   since Ruffian only uses three banks.  */
 	bank_addr = (unsigned long)PYXIS_MCR + offset;
 	bank = *(vulp)bank_addr;
-    
+
 	/* Check BANK_ENABLE */
 	if (bank & 0x01) {
 		static unsigned long size[] __initdata = {
-			0x40000000UL, /* 0x00,   1G */ 
+			0x40000000UL, /* 0x00,   1G */
 			0x20000000UL, /* 0x02, 512M */
 			0x10000000UL, /* 0x04, 256M */
 			0x08000000UL, /* 0x06, 128M */

@@ -203,7 +203,7 @@ ruffian_get_bank_size(unsigned long offs
 		};
 
 		bank = (bank & 0x1e) >> 1;
-		if (bank < sizeof(size)/sizeof(*size))
+		if (bank < ARRAY_SIZE(size))
 			ret = size[bank];
 	}
arch/alpha/kernel/time.c +1 -1
index 50eccde..b191cc7 100644
@@ -233,7 +233,7 @@ validate_cc_value(unsigned long cc)
 	index = cpu->type & 0xffffffff;
 
 	/* If index out of bounds, no way to validate.  */
-	if (index >= sizeof(cpu_hz)/sizeof(cpu_hz[0]))
+	if (index >= ARRAY_SIZE(cpu_hz))
 		return cc;
 
 	/* If index contains no data, no way to validate.  */
Signature · 6 lines
1.4.1

_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors