[PATCH] uml: Use ARRAY_SIZE more assiduously

There were a bunch of missed ARRAY_SIZE opportunities.

Also, some formatting fixes in the affected areas of code.

Signed-off-by: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

4 files changed, 7 insertions, 6 deletions

diff --git a/arch/um/drivers/chan_kern.c b/arch/um/drivers/chan_kern.c
index 7218c754505b..e82764f75e7f 100644
--- a/arch/um/drivers/chan_kern.c
+++ b/arch/um/drivers/chan_kern.c
@@ -544,7 +544,7 @@ static struct chan *parse_chan(struct line *line, char *str, int device,
 
         ops = NULL;
         data = NULL;
-        for(i = 0; i < sizeof(chan_table)/sizeof(chan_table[0]); i++){
+        for(i = 0; i < ARRAY_SIZE(chan_table); i++){
                 entry = &chan_table[i];
                 if(!strncmp(str, entry->key, strlen(entry->key))){
                         ops = entry->ops;
diff --git a/arch/um/drivers/mconsole_kern.c b/arch/um/drivers/mconsole_kern.c
index b414522f7686..79610b5ce67e 100644
--- a/arch/um/drivers/mconsole_kern.c
+++ b/arch/um/drivers/mconsole_kern.c
@@ -497,7 +497,7 @@ static void mconsole_get_config(int (*get_config)(char *, char *, int,
         }
 
         error = NULL;
-        size = sizeof(default_buf)/sizeof(default_buf[0]);
+        size = ARRAY_SIZE(default_buf);
         buf = default_buf;
 
         while(1){
diff --git a/arch/um/drivers/mconsole_user.c b/arch/um/drivers/mconsole_user.c
index 9bfd405c3bd8..5b2f5fe9e426 100644
--- a/arch/um/drivers/mconsole_user.c
+++ b/arch/um/drivers/mconsole_user.c
@@ -16,6 +16,7 @@
 #include "user.h"
 #include "mconsole.h"
 #include "umid.h"
+#include "user_util.h"
 
 static struct mconsole_command commands[] = {
         /* With uts namespaces, uts information becomes process-specific, so
@@ -65,14 +66,14 @@ static struct mconsole_command *mconsole_parse(struct mc_request *req)
         struct mconsole_command *cmd;
         int i;
 
-        for(i=0;i<sizeof(commands)/sizeof(commands[0]);i++){
+        for(i = 0; i < ARRAY_SIZE(commands); i++){
                 cmd = &commands[i];
                 if(!strncmp(req->request.data, cmd->command, 
                             strlen(cmd->command))){
-                        return(cmd);
+                        return cmd;
                 }
         }
-        return(NULL);
+        return NULL;
 }
 
 #define MIN(a,b) ((a)<(b) ? (a):(b))
diff --git a/arch/um/drivers/pcap_kern.c b/arch/um/drivers/pcap_kern.c
index 466ff2c2f918..4c767c7adb96 100644
--- a/arch/um/drivers/pcap_kern.c
+++ b/arch/um/drivers/pcap_kern.c
@@ -76,7 +76,7 @@ int pcap_setup(char *str, char **mac_out, void *data)
         if(host_if != NULL)
                 init->host_if = host_if;
 
-        for(i = 0; i < sizeof(options)/sizeof(options[0]); i++){
+        for(i = 0; i < ARRAY_SIZE(options); i++){
                 if(options[i] == NULL)
                         continue;
                 if(!strcmp(options[i], "promisc"))