[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>

diff --git a/arch/um/drivers/chan_kern.c b/arch/um/drivers/chan_kern.c
index 7218c754505bf99a4a9a1888398d32d1b8aa849d..e82764f75e7f149c5144f3d4d984c9cac990c06b 100644 (file)
--- 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 b414522f7686cadff6f4f0752c100bed57d8144a..79610b5ce67ed5978aa5b74ee109411616c76e60 100644 (file)
--- 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 9bfd405c3bd82e5b891c9263d2fe339599ea0651..5b2f5fe9e426d3d45043bae9a49badb804a9426e 100644 (file)
--- 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 466ff2c2f9183074b7e0e5faf13d676a617c2fe7..4c767c7adb964d5546383a4b20e57302334efc2a 100644 (file)
--- 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"))

diff --git a/arch/um/kernel/mem.c b/arch/um/kernel/mem.c
index b1cd5c6e468b5ddacb242df1417de2f95e8119b5..93121c6d26e55594fe8bb505ebdd17ef20de145c 100644 (file)
--- a/arch/um/kernel/mem.c
+++ b/arch/um/kernel/mem.c
@@ -223,8 +223,9 @@ void paging_init(void)
 
        empty_zero_page = (unsigned long *) alloc_bootmem_low_pages(PAGE_SIZE);
        empty_bad_page = (unsigned long *) alloc_bootmem_low_pages(PAGE_SIZE);
-       for(i=0;i<sizeof(zones_size)/sizeof(zones_size[0]);i++) 
+       for(i = 0; i < ARRAY_SIZE(zones_size); i++)
                zones_size[i] = 0;
+
        zones_size[ZONE_DMA] = (end_iomem >> PAGE_SHIFT) - (uml_physmem >> PAGE_SHIFT);
 #ifdef CONFIG_HIGHMEM
        zones_size[ZONE_HIGHMEM] = highmem >> PAGE_SHIFT;

diff --git a/arch/um/kernel/reboot.c b/arch/um/kernel/reboot.c
index 3ef73bf2e781a79dbd039c623fc20c3dd3f289d5..f602623644aa4f44c98e25bbf24bd7408275a25d 100644 (file)
--- a/arch/um/kernel/reboot.c
+++ b/arch/um/kernel/reboot.c
@@ -22,7 +22,7 @@ static void kill_idlers(int me)
        struct task_struct *p;
        int i;
 
-       for(i = 0; i < sizeof(idle_threads)/sizeof(idle_threads[0]); i++){
+       for(i = 0; i < ARRAY_SIZE(idle_threads); i++){
                p = idle_threads[i];
                if((p != NULL) && (p->thread.mode.tt.extern_pid != me))
                        os_kill_process(p->thread.mode.tt.extern_pid, 0);
@@ -62,14 +62,3 @@ void machine_halt(void)
 {
        machine_power_off();
 }
-
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */

diff --git a/arch/um/kernel/tlb.c b/arch/um/kernel/tlb.c
index f5b0636f9ad73fcdb3aa5bea335a3bac344c8eb8..cca330edf717ebc5ed7c19289c467ecce4c9c307 100644 (file)
--- a/arch/um/kernel/tlb.c
+++ b/arch/um/kernel/tlb.c
@@ -137,10 +137,11 @@ void fix_range_common(struct mm_struct *mm, unsigned long start_addr,
         int r, w, x;
         struct host_vm_op ops[1];
         void *flush = NULL;
-        int op_index = -1, last_op = sizeof(ops) / sizeof(ops[0]) - 1;
+        int op_index = -1, last_op = ARRAY_SIZE(ops) - 1;
         int ret = 0;
 
-        if(mm == NULL) return;
+        if(mm == NULL)
+               return;
 
         ops[0].type = NONE;
         for(addr = start_addr; addr < end_addr && !ret;){

diff --git a/arch/um/os-Linux/mem.c b/arch/um/os-Linux/mem.c
index 560c8063c77cb80fa54b196fbd078cf8bc19895d..b170b4704dc40aa25137f6ab29ece4b36eb03078 100644 (file)
--- a/arch/um/os-Linux/mem.c
+++ b/arch/um/os-Linux/mem.c
@@ -114,14 +114,14 @@ static void which_tmpdir(void)
        }
 
        while(1){
-               found = next(fd, buf, sizeof(buf) / sizeof(buf[0]), ' ');
+               found = next(fd, buf, ARRAY_SIZE(buf), ' ');
                if(found != 1)
                        break;
 
                if(!strncmp(buf, "/dev/shm", strlen("/dev/shm")))
                        goto found;
 
-               found = next(fd, buf, sizeof(buf) / sizeof(buf[0]), '\n');
+               found = next(fd, buf, ARRAY_SIZE(buf), '\n');
                if(found != 1)
                        break;
        }
@@ -135,7 +135,7 @@ err:
        return;
 
 found:
-       found = next(fd, buf, sizeof(buf) / sizeof(buf[0]), ' ');
+       found = next(fd, buf, ARRAY_SIZE(buf), ' ');
        if(found != 1)
                goto err;
 

diff --git a/arch/um/sys-i386/bugs.c b/arch/um/sys-i386/bugs.c
index 41b0ab2fe8300ee6efa200557b8686b5dbfe8d0e..f1bcd399ac90f2837d90c5d48f0932458d4d609c 100644 (file)
--- a/arch/um/sys-i386/bugs.c
+++ b/arch/um/sys-i386/bugs.c
@@ -13,6 +13,7 @@
 #include "sysdep/ptrace.h"
 #include "task.h"
 #include "os.h"
+#include "user_util.h"
 
 #define MAXTOKEN 64
 
@@ -104,17 +105,17 @@ int cpu_feature(char *what, char *buf, int len)
 static int check_cpu_flag(char *feature, int *have_it)
 {
        char buf[MAXTOKEN], c;
-       int fd, len = sizeof(buf)/sizeof(buf[0]);
+       int fd, len = ARRAY_SIZE(buf);
 
        printk("Checking for host processor %s support...", feature);
        fd = os_open_file("/proc/cpuinfo", of_read(OPENFLAGS()), 0);
        if(fd < 0){
                printk("Couldn't open /proc/cpuinfo, err = %d\n", -fd);
-               return(0);
+               return 0;
        }
 
        *have_it = 0;
-       if(!find_cpuinfo_line(fd, "flags", buf, sizeof(buf) / sizeof(buf[0])))
+       if(!find_cpuinfo_line(fd, "flags", buf, ARRAY_SIZE(buf)))
                goto out;
 
        c = token(fd, buf, len - 1, ' ');
@@ -138,7 +139,7 @@ static int check_cpu_flag(char *feature, int *have_it)
        if(*have_it == 0) printk("No\n");
        else if(*have_it == 1) printk("Yes\n");
        os_close_file(fd);
-       return(1);
+       return 1;
 }
 
 #if 0 /* This doesn't work in tt mode, plus it's causing compilation problems

diff --git a/arch/um/sys-i386/ldt.c b/arch/um/sys-i386/ldt.c
index fe0877b3509ca12da1e0652ecbd245aeaab1f7f6..69971b78beaf9900a92d27de56117343f05d26c7 100644 (file)
--- a/arch/um/sys-i386/ldt.c
+++ b/arch/um/sys-i386/ldt.c
@@ -424,9 +424,8 @@ void ldt_get_host_info(void)
                        size++;
        }
 
-       if(size < sizeof(dummy_list)/sizeof(dummy_list[0])) {
+       if(size < ARRAY_SIZE(dummy_list))
                host_ldt_entries = dummy_list;
-       }
        else {
                size = (size + 1) * sizeof(dummy_list[0]);
                host_ldt_entries = (short *)kmalloc(size, GFP_KERNEL);

diff --git a/arch/um/sys-i386/ptrace_user.c b/arch/um/sys-i386/ptrace_user.c
index 40aa885314469f40bee2ee2a3ae171becbc0840c..5f3cc66858209f67c6caf9ebc9f46a808e907498 100644 (file)
--- a/arch/um/sys-i386/ptrace_user.c
+++ b/arch/um/sys-i386/ptrace_user.c
@@ -15,6 +15,7 @@
 #include "user.h"
 #include "os.h"
 #include "uml-config.h"
+#include "user_util.h"
 
 int ptrace_getregs(long pid, unsigned long *regs_out)
 {
@@ -51,7 +52,7 @@ static void write_debugregs(int pid, unsigned long *regs)
        int nregs, i;
 
        dummy = NULL;
-       nregs = sizeof(dummy->u_debugreg)/sizeof(dummy->u_debugreg[0]);
+       nregs = ARRAY_SIZE(dummy->u_debugreg);
        for(i = 0; i < nregs; i++){
                if((i == 4) || (i == 5)) continue;
                if(ptrace(PTRACE_POKEUSR, pid, &dummy->u_debugreg[i],
@@ -68,7 +69,7 @@ static void read_debugregs(int pid, unsigned long *regs)
        int nregs, i;
 
        dummy = NULL;
-       nregs = sizeof(dummy->u_debugreg)/sizeof(dummy->u_debugreg[0]);
+       nregs = ARRAY_SIZE(dummy->u_debugreg);
        for(i = 0; i < nregs; i++){
                regs[i] = ptrace(PTRACE_PEEKUSR, pid,
                                 &dummy->u_debugreg[i], 0);