| Message ID | 5f6b9c8c83170ed310953eac2f5b14539bfc964a.1621516826.git.christophe.leroy@csgroup.eu (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | powerpc: Cleanup use of 'struct ppc_inst' | expand |
| Related | show |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | Successfully applied on branch powerpc/merge (258eb1f3aaa9face35e613c229c1337263491ea0) |
| snowpatch_ozlabs/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 37 lines checked |
| snowpatch_ozlabs/needsstable | success | Patch has no Fixes tags |
On Thu, May 20, 2021 at 11:50 PM Christophe Leroy <christophe.leroy@csgroup.eu> wrote: > > instr_is_branch_to_addr() is only used in code-patching.c > > Make it static. > > Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> > --- > arch/powerpc/include/asm/code-patching.h | 1 - > arch/powerpc/lib/code-patching.c | 18 +++++++++--------- > 2 files changed, 9 insertions(+), 10 deletions(-) > > diff --git a/arch/powerpc/include/asm/code-patching.h b/arch/powerpc/include/asm/code-patching.h > index f1d029bf906e..f9bd1397b696 100644 > --- a/arch/powerpc/include/asm/code-patching.h > +++ b/arch/powerpc/include/asm/code-patching.h > @@ -59,7 +59,6 @@ static inline int modify_instruction_site(s32 *site, unsigned int clr, unsigned > > int instr_is_relative_branch(struct ppc_inst instr); > int instr_is_relative_link_branch(struct ppc_inst instr); > -int instr_is_branch_to_addr(const struct ppc_inst *instr, unsigned long addr); > unsigned long branch_target(const struct ppc_inst *instr); > int translate_branch(struct ppc_inst *instr, const struct ppc_inst *dest, > const struct ppc_inst *src); > diff --git a/arch/powerpc/lib/code-patching.c b/arch/powerpc/lib/code-patching.c > index 0308429b0d1a..82f2c1edb498 100644 > --- a/arch/powerpc/lib/code-patching.c > +++ b/arch/powerpc/lib/code-patching.c > @@ -367,15 +367,6 @@ unsigned long branch_target(const struct ppc_inst *instr) > return 0; > } > > -int instr_is_branch_to_addr(const struct ppc_inst *instr, unsigned long addr) > -{ > - if (instr_is_branch_iform(ppc_inst_read(instr)) || > - instr_is_branch_bform(ppc_inst_read(instr))) > - return branch_target(instr) == addr; > - > - return 0; > -} > - > int translate_branch(struct ppc_inst *instr, const struct ppc_inst *dest, > const struct ppc_inst *src) > { > @@ -410,6 +401,15 @@ void __patch_exception(int exc, unsigned long addr) > > #ifdef CONFIG_CODE_PATCHING_SELFTEST > > +static int instr_is_branch_to_addr(const struct ppc_inst *instr, unsigned long addr) > +{ > + if (instr_is_branch_iform(ppc_inst_read(instr)) || > + instr_is_branch_bform(ppc_inst_read(instr))) > + return branch_target(instr) == addr; > + > + return 0; > +} > + > static void __init test_trampoline(void) > { > asm ("nop;\n"); > -- > 2.25.0 > Reviewed by: Jordan Niethe <jniethe5@gmail.com>
diff --git a/arch/powerpc/include/asm/code-patching.h b/arch/powerpc/include/asm/code-patching.h index f1d029bf906e..f9bd1397b696 100644 --- a/arch/powerpc/include/asm/code-patching.h +++ b/arch/powerpc/include/asm/code-patching.h @@ -59,7 +59,6 @@ static inline int modify_instruction_site(s32 *site, unsigned int clr, unsigned int instr_is_relative_branch(struct ppc_inst instr); int instr_is_relative_link_branch(struct ppc_inst instr); -int instr_is_branch_to_addr(const struct ppc_inst *instr, unsigned long addr); unsigned long branch_target(const struct ppc_inst *instr); int translate_branch(struct ppc_inst *instr, const struct ppc_inst *dest, const struct ppc_inst *src); diff --git a/arch/powerpc/lib/code-patching.c b/arch/powerpc/lib/code-patching.c index 0308429b0d1a..82f2c1edb498 100644 --- a/arch/powerpc/lib/code-patching.c +++ b/arch/powerpc/lib/code-patching.c @@ -367,15 +367,6 @@ unsigned long branch_target(const struct ppc_inst *instr) return 0; } -int instr_is_branch_to_addr(const struct ppc_inst *instr, unsigned long addr) -{ - if (instr_is_branch_iform(ppc_inst_read(instr)) || - instr_is_branch_bform(ppc_inst_read(instr))) - return branch_target(instr) == addr; - - return 0; -} - int translate_branch(struct ppc_inst *instr, const struct ppc_inst *dest, const struct ppc_inst *src) { @@ -410,6 +401,15 @@ void __patch_exception(int exc, unsigned long addr) #ifdef CONFIG_CODE_PATCHING_SELFTEST +static int instr_is_branch_to_addr(const struct ppc_inst *instr, unsigned long addr) +{ + if (instr_is_branch_iform(ppc_inst_read(instr)) || + instr_is_branch_bform(ppc_inst_read(instr))) + return branch_target(instr) == addr; + + return 0; +} + static void __init test_trampoline(void) { asm ("nop;\n");
instr_is_branch_to_addr() is only used in code-patching.c Make it static. Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> --- arch/powerpc/include/asm/code-patching.h | 1 - arch/powerpc/lib/code-patching.c | 18 +++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-)