Skip to contentSkip to conversation

zorro: use ARRAY_SIZE

PATCH In review Himangi Saraogi 2 participants 2 messages Jun 16, 2014 – Jun 23, 2014 m68k architecture

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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>

---
 drivers/zorro/names.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/zorro/names.c +1 -1
index 6f3fd99..4ccbcc9 100644
@@ -52,7 +52,7 @@ static struct zorro_manuf_info __initdata zorro_manuf_list[] = {
 #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)
 {
Signature · 1 line
1.9.1
#1 lore raw
Quoted 11 lines · Himangi Saraogi

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;
@@

Quoted 6 lines

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

Thanks!

Will apply and queue for v3.17.
I also converted the MANUF definition a few lines above:

-#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 },

Quoted 9 lines
---
 drivers/zorro/names.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/zorro/names.c +0 -0
index 6f3fd99..4ccbcc9 100644

drivers/zorro/names.c static struct zorro_manuf_info __initdata zorro_manuf_list[] = { · line 58

Quoted 8 lines
drivers/zorro/names.c +1 -1
@@ -52,7 +52,7 @@ static struct zorro_manuf_info __initdata zorro_manuf_list[] = {
 #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)
 {

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds