From: Andrew Morton <akpm@osdl.org>

Kill NELEM, use standard macro.

Cc: Latchesar Ionkov <lucho@ionkov.net>
Cc: Eric Van Hensbergen <ericvh@ericvh.myip.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 fs/9p/mux.c |   24 +++++++++++-------------
 1 files changed, 11 insertions(+), 13 deletions(-)

diff -puN fs/9p/mux.c~v9fs-new-multiplexer-implementation-tidy fs/9p/mux.c
--- 25/fs/9p/mux.c~v9fs-new-multiplexer-implementation-tidy	Wed Jan  4 17:11:10 2006
+++ 25-akpm/fs/9p/mux.c	Wed Jan  4 17:11:10 2006
@@ -39,8 +39,6 @@
 #include "conv.h"
 #include "mux.h"
 
-#define NELEM(x) (sizeof(x) / sizeof((x)[0]))
-
 #define ERREQFLUSH	1
 #define SCHED_TIMEOUT	10
 #define MAXPOLLWADDR	2
@@ -120,7 +118,7 @@ void v9fs_mux_global_init(void)
 {
 	int i;
 
-	for (i = 0; i < NELEM(v9fs_mux_poll_tasks); i++)
+	for (i = 0; i < ARRAY_SIZE(v9fs_mux_poll_tasks); i++)
 		v9fs_mux_poll_tasks[i].task = NULL;
 
 	v9fs_mux_wq = create_workqueue("v9fs");
@@ -147,8 +145,8 @@ inline int v9fs_mux_calc_poll_procs(int 
 	else
 		n = 1;
 
-	if (n > NELEM(v9fs_mux_poll_tasks))
-		n = NELEM(v9fs_mux_poll_tasks);
+	if (n > ARRAY_SIZE(v9fs_mux_poll_tasks))
+		n = ARRAY_SIZE(v9fs_mux_poll_tasks);
 
 	return n;
 }
@@ -164,7 +162,7 @@ static void v9fs_mux_poll_start(struct v
 
 	n = v9fs_mux_calc_poll_procs(v9fs_mux_num + 1);
 	if (n > v9fs_mux_poll_task_num) {
-		for (i = 0; i < NELEM(v9fs_mux_poll_tasks); i++) {
+		for (i = 0; i < ARRAY_SIZE(v9fs_mux_poll_tasks); i++) {
 			if (v9fs_mux_poll_tasks[i].task == NULL) {
 				vpt = &v9fs_mux_poll_tasks[i];
 				dprintk(DEBUG_MUX, "create proc %p\n", vpt);
@@ -178,7 +176,7 @@ static void v9fs_mux_poll_start(struct v
 			}
 		}
 
-		if (i >= NELEM(v9fs_mux_poll_tasks))
+		if (i >= ARRAY_SIZE(v9fs_mux_poll_tasks))
 			dprintk(DEBUG_ERROR, "warning: no free poll slots\n");
 	}
 
@@ -186,7 +184,7 @@ static void v9fs_mux_poll_start(struct v
 	    ((v9fs_mux_num + 1) % v9fs_mux_poll_task_num ? 1 : 0);
 
 	vptlast = NULL;
-	for (i = 0; i < NELEM(v9fs_mux_poll_tasks); i++) {
+	for (i = 0; i < ARRAY_SIZE(v9fs_mux_poll_tasks); i++) {
 		vpt = &v9fs_mux_poll_tasks[i];
 		if (vpt->task != NULL) {
 			vptlast = vpt;
@@ -202,7 +200,7 @@ static void v9fs_mux_poll_start(struct v
 		}
 	}
 
-	if (i >= NELEM(v9fs_mux_poll_tasks)) {
+	if (i >= ARRAY_SIZE(v9fs_mux_poll_tasks)) {
 		dprintk(DEBUG_MUX, "put in proc %d\n", i);
 		list_add(&m->mux_list, &vptlast->mux_list);
 		vptlast->muxnum++;
@@ -223,7 +221,7 @@ static void v9fs_mux_poll_stop(struct v9
 	up(&v9fs_mux_task_lock);
 	vpt = m->poll_task;
 	list_del(&m->mux_list);
-	for(i = 0; i < NELEM(m->poll_waddr); i++) {
+	for(i = 0; i < ARRAY_SIZE(m->poll_waddr); i++) {
 		if (m->poll_waddr[i] != NULL) {
 			remove_wait_queue(m->poll_waddr[i], &m->poll_wait[i]);
 			m->poll_waddr[i] = NULL;
@@ -291,7 +289,7 @@ struct v9fs_mux_data *v9fs_mux_init(stru
 		set_bit(Wpending, &m->wsched);
 	}
 
-	for(i = 0; i < NELEM(m->poll_waddr); i++) {
+	for(i = 0; i < ARRAY_SIZE(m->poll_waddr); i++) {
 		if (IS_ERR(m->poll_waddr[i])) {
 			v9fs_mux_poll_stop(m);
 			mtmp = (void *)m->poll_waddr;	/* the error code */
@@ -340,11 +338,11 @@ v9fs_pollwait(struct file *filp, wait_qu
 	struct v9fs_mux_data *m;
 
 	m = container_of(p, struct v9fs_mux_data, pt);
-	for(i = 0; i < NELEM(m->poll_waddr); i++)
+	for(i = 0; i < ARRAY_SIZE(m->poll_waddr); i++)
 		if (m->poll_waddr[i] == NULL)
 			break;
 
-	if (i >= NELEM(m->poll_waddr)) {
+	if (i >= ARRAY_SIZE(m->poll_waddr)) {
 		dprintk(DEBUG_ERROR, "not enough wait_address slots\n");
 		return;
 	}
_