1 files changed, 7 insertions, 14 deletions

diff --git a/arch/mips/include/asm/syscall.h b/arch/mips/include/asm/syscall.h
index 83bb439597d8..25fa651c937d 100644
--- a/arch/mips/include/asm/syscall.h
+++ b/arch/mips/include/asm/syscall.h
@@ -54,7 +54,7 @@ static inline void mips_syscall_update_nr(struct task_struct *task,
                 task_thread_info(task)->syscall = regs->regs[2];
 }
 
-static inline unsigned long mips_get_syscall_arg(unsigned long *arg,
+static inline void mips_get_syscall_arg(unsigned long *arg,
         struct task_struct *task, struct pt_regs *regs, unsigned int n)
 {
         unsigned long usp __maybe_unused = regs->regs[29];
@@ -63,23 +63,24 @@ static inline unsigned long mips_get_syscall_arg(unsigned long *arg,
         case 0: case 1: case 2: case 3:
                 *arg = regs->regs[4 + n];
 
-                return 0;
+                return;
 
 #ifdef CONFIG_32BIT
         case 4: case 5: case 6: case 7:
-                return get_user(*arg, (int *)usp + n);
+                get_user(*arg, (int *)usp + n);
+                return;
 #endif
 
 #ifdef CONFIG_64BIT
         case 4: case 5: case 6: case 7:
 #ifdef CONFIG_MIPS32_O32
                 if (test_tsk_thread_flag(task, TIF_32BIT_REGS))
-                        return get_user(*arg, (int *)usp + n);
+                        get_user(*arg, (int *)usp + n);
                 else
 #endif
                         *arg = regs->regs[4 + n];
 
-                return 0;
+                return;
 #endif
 
         default:
@@ -126,21 +127,13 @@ static inline void syscall_get_arguments(struct task_struct *task,
 {
         unsigned int i = 0;
         unsigned int n = 6;
-        int ret;
 
         /* O32 ABI syscall() */
         if (mips_syscall_is_indirect(task, regs))
                 i++;
 
         while (n--)
-                ret |= mips_get_syscall_arg(args++, task, regs, i++);
-
-        /*
-         * No way to communicate an error because this is a void function.
-         */
-#if 0
-        return ret;
-#endif
+                mips_get_syscall_arg(args++, task, regs, i++);
 }
 
 extern const unsigned long sys_call_table[];