[PATCH] drivers/video: Use ARRAY_SIZE macro

Use ARRAY_SIZE macro instead of sizeof(x)/sizeof(x[0]) and remove
duplicates of ARRAY_SIZE.  Some coding style and trailing whitespaces are
also fixed.

Compile-tested where possible (some are other arch or BROKEN)

Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 6 insertions, 8 deletions

diff --git a/drivers/video/chipsfb.c b/drivers/video/chipsfb.c
index bc061d4ec786..72ff6bf75e5e 100644
--- a/drivers/video/chipsfb.c
+++ b/drivers/video/chipsfb.c
@@ -178,8 +178,6 @@ struct chips_init_reg {
         unsigned char data;
 };
 
-#define N_ELTS(x)       (sizeof(x) / sizeof(x[0]))
-
 static struct chips_init_reg chips_init_sr[] = {
         { 0x00, 0x03 },
         { 0x01, 0x01 },
@@ -287,18 +285,18 @@ static void __init chips_hw_init(void)
 {
         int i;
 
-        for (i = 0; i < N_ELTS(chips_init_xr); ++i)
+        for (i = 0; i < ARRAY_SIZE(chips_init_xr); ++i)
                 write_xr(chips_init_xr[i].addr, chips_init_xr[i].data);
         outb(0x29, 0x3c2); /* set misc output reg */
-        for (i = 0; i < N_ELTS(chips_init_sr); ++i)
+        for (i = 0; i < ARRAY_SIZE(chips_init_sr); ++i)
                 write_sr(chips_init_sr[i].addr, chips_init_sr[i].data);
-        for (i = 0; i < N_ELTS(chips_init_gr); ++i)
+        for (i = 0; i < ARRAY_SIZE(chips_init_gr); ++i)
                 write_gr(chips_init_gr[i].addr, chips_init_gr[i].data);
-        for (i = 0; i < N_ELTS(chips_init_ar); ++i)
+        for (i = 0; i < ARRAY_SIZE(chips_init_ar); ++i)
                 write_ar(chips_init_ar[i].addr, chips_init_ar[i].data);
-        for (i = 0; i < N_ELTS(chips_init_cr); ++i)
+        for (i = 0; i < ARRAY_SIZE(chips_init_cr); ++i)
                 write_cr(chips_init_cr[i].addr, chips_init_cr[i].data);
-        for (i = 0; i < N_ELTS(chips_init_fr); ++i)
+        for (i = 0; i < ARRAY_SIZE(chips_init_fr); ++i)
                 write_fr(chips_init_fr[i].addr, chips_init_fr[i].data);
 }