浏览代码

zorro: Use ARRAY_SIZE

ARRAY_SIZE is more concise to use when the size of an array is divided
by the size of its type or the size of its first element.

The Coccinelle semantic patch that makes this change is as follows:

// <smpl>
@@
type T;
T[] E;
@@

- (sizeof(E)/sizeof(T))
+ ARRAY_SIZE(E)
// </smpl>

Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
[Geert: Also convert the MANUF definition]
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Himangi Saraogi 11 年之前
父节点
当前提交
0b9d22dc57
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      drivers/zorro/names.c

+ 2 - 2
drivers/zorro/names.c

@@ -46,13 +46,13 @@ struct zorro_manuf_info {
 #include "devlist.h"
 #include "devlist.h"
 
 
 static struct zorro_manuf_info __initdata zorro_manuf_list[] = {
 static struct zorro_manuf_info __initdata zorro_manuf_list[] = {
-#define MANUF( manuf, name )		{ 0x##manuf, sizeof(__prods_##manuf) / sizeof(struct zorro_prod_info), __manufstr_##manuf, __prods_##manuf },
+#define MANUF( manuf, name )		{ 0x##manuf, ARRAY_SIZE(__prods_##manuf), __manufstr_##manuf, __prods_##manuf },
 #define ENDMANUF()
 #define ENDMANUF()
 #define PRODUCT( manuf, prod, name )
 #define PRODUCT( manuf, prod, name )
 #include "devlist.h"
 #include "devlist.h"
 };
 };
 
 
-#define MANUFS (sizeof(zorro_manuf_list)/sizeof(struct zorro_manuf_info))
+#define MANUFS ARRAY_SIZE(zorro_manuf_list)
 
 
 void __init zorro_name_device(struct zorro_dev *dev)
 void __init zorro_name_device(struct zorro_dev *dev)
 {
 {