[PATCH] M68KNOMMU: user ARRAY_SIZE macro when appropriate

Use ARRAY_SIZE macro already defined in linux/kernel.h

Signed-off-by: Ahmed S. Darwish <darwish.07@gmail.com>
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

2 files changed, 3 insertions, 3 deletions

diff --git a/arch/m68knommu/kernel/ptrace.c b/arch/m68knommu/kernel/ptrace.c
index 9130119537b9..72d349623575 100644
--- a/arch/m68knommu/kernel/ptrace.c
+++ b/arch/m68knommu/kernel/ptrace.c
@@ -62,7 +62,7 @@ static inline long get_reg(struct task_struct *task, int regno)
 
         if (regno == PT_USP)
                 addr = &task->thread.usp;
-        else if (regno < sizeof(regoff)/sizeof(regoff[0]))
+        else if (regno < ARRAY_SIZE(regoff))
                 addr = (unsigned long *)(task->thread.esp0 + regoff[regno]);
         else
                 return 0;
@@ -79,7 +79,7 @@ static inline int put_reg(struct task_struct *task, int regno,
 
         if (regno == PT_USP)
                 addr = &task->thread.usp;
-        else if (regno < sizeof(regoff)/sizeof(regoff[0]))
+        else if (regno < ARRAY_SIZE(regoff))
                 addr = (unsigned long *) (task->thread.esp0 + regoff[regno]);
         else
                 return -1;
diff --git a/arch/m68knommu/kernel/traps.c b/arch/m68knommu/kernel/traps.c
index 9129b3a5258b..bed5f47bf568 100644
--- a/arch/m68knommu/kernel/traps.c
+++ b/arch/m68knommu/kernel/traps.c
@@ -158,7 +158,7 @@ void show_stack(struct task_struct *task, unsigned long *stack)
 void bad_super_trap(struct frame *fp)
 {
         console_verbose();
-        if (fp->ptregs.vector < 4*sizeof(vec_names)/sizeof(vec_names[0]))
+        if (fp->ptregs.vector < 4 * ARRAY_SIZE(vec_names))
                 printk (KERN_WARNING "*** %s ***   FORMAT=%X\n",
                         vec_names[(fp->ptregs.vector) >> 2],
                         fp->ptregs.format);