powerpc/uaccess: Switch __patch_instruction() to __put_user_asm_goto()

__patch_instruction() is the only user of __put_user_asm() outside
of asm/uaccess.h

Switch to the new __put_user_asm_goto() to enable retirement of
__put_user_asm() in a later patch.

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/b9745b122f4a9ae72cef445c61320022ab8b77b7.1599216721.git.christophe.leroy@csgroup.eu

diff --git a/arch/powerpc/lib/code-patching.c b/arch/powerpc/lib/code-patching.c
index 8c3934e..2333625 100644 (file)
--- a/arch/powerpc/lib/code-patching.c
+++ b/arch/powerpc/lib/code-patching.c
@@ -21,21 +21,18 @@
 static int __patch_instruction(struct ppc_inst *exec_addr, struct ppc_inst instr,
                               struct ppc_inst *patch_addr)
 {
-       int err = 0;
-
-       if (!ppc_inst_prefixed(instr)) {
-               __put_user_asm(ppc_inst_val(instr), patch_addr, err, "stw");
-       } else {
-               __put_user_asm(ppc_inst_as_u64(instr), patch_addr, err, "std");
-       }
-
-       if (err)
-               return err;
+       if (!ppc_inst_prefixed(instr))
+               __put_user_asm_goto(ppc_inst_val(instr), patch_addr, failed, "stw");
+       else
+               __put_user_asm_goto(ppc_inst_as_u64(instr), patch_addr, failed, "std");
 
        asm ("dcbst 0, %0; sync; icbi 0,%1; sync; isync" :: "r" (patch_addr),
                                                            "r" (exec_addr));
 
        return 0;
+
+failed:
+       return -EFAULT;
 }
 
 int raw_patch_instruction(struct ppc_inst *addr, struct ppc_inst instr)