3 files changed, 15 insertions, 50 deletions

diff --git a/arch/sh/include/asm/mutex-llsc.h b/arch/sh/include/asm/mutex-llsc.h
index ee839ee58ac8..090358a7e1bb 100644
--- a/arch/sh/include/asm/mutex-llsc.h
+++ b/arch/sh/include/asm/mutex-llsc.h
@@ -21,38 +21,36 @@
 static inline void
 __mutex_fastpath_lock(atomic_t *count, void (*fail_fn)(atomic_t *))
 {
-        int __ex_flag, __res;
+        int __done, __res;
 
         __asm__ __volatile__ (
                 "movli.l        @%2, %0 \n"
                 "add            #-1, %0 \n"
                 "movco.l        %0, @%2 \n"
                 "movt           %1      \n"
-                : "=&z" (__res), "=&r" (__ex_flag)
+                : "=&z" (__res), "=&r" (__done)
                 : "r" (&(count)->counter)
                 : "t");
 
-        __res |= !__ex_flag;
-        if (unlikely(__res != 0))
+        if (unlikely(!__done || __res != 0))
                 fail_fn(count);
 }
 
 static inline int
 __mutex_fastpath_lock_retval(atomic_t *count, int (*fail_fn)(atomic_t *))
 {
-        int __ex_flag, __res;
+        int __done, __res;
 
         __asm__ __volatile__ (
                 "movli.l        @%2, %0 \n"
                 "add            #-1, %0 \n"
                 "movco.l        %0, @%2 \n"
                 "movt           %1      \n"
-                : "=&z" (__res), "=&r" (__ex_flag)
+                : "=&z" (__res), "=&r" (__done)
                 : "r" (&(count)->counter)
                 : "t");
 
-        __res |= !__ex_flag;
-        if (unlikely(__res != 0))
+        if (unlikely(!__done || __res != 0))
                 __res = fail_fn(count);
 
         return __res;
@@ -61,19 +59,18 @@ __mutex_fastpath_lock_retval(atomic_t *count, int (*fail_fn)(atomic_t *))
 static inline void
 __mutex_fastpath_unlock(atomic_t *count, void (*fail_fn)(atomic_t *))
 {
-        int __ex_flag, __res;
+        int __done, __res;
 
         __asm__ __volatile__ (
                 "movli.l        @%2, %0 \n\t"
                 "add            #1, %0  \n\t"
                 "movco.l        %0, @%2 \n\t"
                 "movt           %1      \n\t"
-                : "=&z" (__res), "=&r" (__ex_flag)
+                : "=&z" (__res), "=&r" (__done)
                 : "r" (&(count)->counter)
                 : "t");
 
-        __res |= !__ex_flag;
-        if (unlikely(__res <= 0))
+        if (unlikely(!__done || __res <= 0))
                 fail_fn(count);
 }
 
diff --git a/arch/sh/include/asm/syscall_32.h b/arch/sh/include/asm/syscall_32.h
index 05a868a71ef5..5bc34681d994 100644
--- a/arch/sh/include/asm/syscall_32.h
+++ b/arch/sh/include/asm/syscall_32.h
@@ -21,23 +21,10 @@ static inline void syscall_rollback(struct task_struct *task,
          */
 }
 
-static inline bool syscall_has_error(struct pt_regs *regs)
-{
-        return (regs->sr & 0x1) ? true : false;
-}
-static inline void syscall_set_error(struct pt_regs *regs)
-{
-        regs->sr |= 0x1;
-}
-static inline void syscall_clear_error(struct pt_regs *regs)
-{
-        regs->sr &= ~0x1;
-}
-
 static inline long syscall_get_error(struct task_struct *task,
                                      struct pt_regs *regs)
 {
-        return syscall_has_error(regs) ? regs->regs[0] : 0;
+        return IS_ERR_VALUE(regs->regs[0]) ? regs->regs[0] : 0;
 }
 
 static inline long syscall_get_return_value(struct task_struct *task,
@@ -50,13 +37,10 @@ static inline void syscall_set_return_value(struct task_struct *task,
                                             struct pt_regs *regs,
                                             int error, long val)
 {
-        if (error) {
-                syscall_set_error(regs);
+        if (error)
                 regs->regs[0] = -error;
-        } else {
-                syscall_clear_error(regs);
+        else
                 regs->regs[0] = val;
-        }
 }
 
 static inline void syscall_get_arguments(struct task_struct *task,
diff --git a/arch/sh/include/asm/syscall_64.h b/arch/sh/include/asm/syscall_64.h
index e1143b9784d6..c3561ca72bee 100644
--- a/arch/sh/include/asm/syscall_64.h
+++ b/arch/sh/include/asm/syscall_64.h
@@ -21,23 +21,10 @@ static inline void syscall_rollback(struct task_struct *task,
          */
 }
 
-static inline bool syscall_has_error(struct pt_regs *regs)
-{
-        return (regs->sr & 0x1) ? true : false;
-}
-static inline void syscall_set_error(struct pt_regs *regs)
-{
-        regs->sr |= 0x1;
-}
-static inline void syscall_clear_error(struct pt_regs *regs)
-{
-        regs->sr &= ~0x1;
-}
-
 static inline long syscall_get_error(struct task_struct *task,
                                      struct pt_regs *regs)
 {
-        return syscall_has_error(regs) ? regs->regs[9] : 0;
+        return IS_ERR_VALUE(regs->regs[9]) ? regs->regs[9] : 0;
 }
 
 static inline long syscall_get_return_value(struct task_struct *task,
@@ -50,13 +37,10 @@ static inline void syscall_set_return_value(struct task_struct *task,
                                             struct pt_regs *regs,
                                             int error, long val)
 {
-        if (error) {
-                syscall_set_error(regs);
+        if (error)
                 regs->regs[9] = -error;
-        } else {
-                syscall_clear_error(regs);
+        else
                 regs->regs[9] = val;
-        }
 }
 
 static inline void syscall_get_arguments(struct task_struct *task,