Patchwork [1/2] net/tipc/bcast.h: use ARRAY_SIZE

login
register
mail settings
Submitter Andrew Morton
Date Jan. 9, 2009, 8:22 p.m.
Message ID <200901092022.n09KMLkf019501@imap1.linux-foundation.org>
Download mbox | patch
Permalink /patch/17582/
State Accepted
Delegated to: David Miller
Headers show

Comments

Andrew Morton - Jan. 9, 2009, 8:22 p.m.
From: Julia Lawall <julia@diku.dk>

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 semantic patch that makes this change is as follows:
(http://www.emn.fr/x-info/coccinelle/)

// <smpl>
@i@
@@

#include <linux/kernel.h>

@depends on i using "paren.iso"@
type T;
T[] E;
@@

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

Signed-off-by: Julia Lawall <julia@diku.dk>
Cc: Per Liden <per.liden@nospam.ericsson.com>
Cc: David S. Miller <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 net/tipc/bcast.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
David Miller - Jan. 10, 2009, 7:09 a.m.
Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff -puN net/tipc/bcast.h~net-tipc-bcasth-use-array_size net/tipc/bcast.h
--- a/net/tipc/bcast.h~net-tipc-bcasth-use-array_size
+++ a/net/tipc/bcast.h
@@ -124,7 +124,7 @@  static inline int tipc_nmap_equal(struct
 static inline void tipc_nmap_diff(struct tipc_node_map *nm_a, struct tipc_node_map *nm_b,
 				  struct tipc_node_map *nm_diff)
 {
-	int stop = sizeof(nm_a->map) / sizeof(u32);
+	int stop = ARRAY_SIZE(nm_a->map);
 	int w;
 	int b;
 	u32 map;