On Mon, Dec 18, 2023 at 10:15:59PM +0900, Masami Hiramatsu (Google) wrote: > From: Masami Hiramatsu (Google) <mhiramat@xxxxxxxxxx> > > Rename ftrace_regs_return_value to ftrace_regs_get_return_value as same as > other ftrace_regs_get/set_* APIs. > > Signed-off-by: Masami Hiramatsu (Google) <mhiramat@xxxxxxxxxx> Acked-by: Mark Rutland <mark.rutland@xxxxxxx> Since this is a trivial cleanup, it might make sense to move this to the start of the series, so that it can be queued even if the later parts need more work. Mark. > --- > Changes in v3: > - Newly added. > --- > arch/loongarch/include/asm/ftrace.h | 2 +- > arch/powerpc/include/asm/ftrace.h | 2 +- > arch/s390/include/asm/ftrace.h | 2 +- > arch/x86/include/asm/ftrace.h | 2 +- > include/linux/ftrace.h | 2 +- > kernel/trace/fgraph.c | 2 +- > 6 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/arch/loongarch/include/asm/ftrace.h b/arch/loongarch/include/asm/ftrace.h > index a11996eb5892..a9c3d0f2f941 100644 > --- a/arch/loongarch/include/asm/ftrace.h > +++ b/arch/loongarch/include/asm/ftrace.h > @@ -70,7 +70,7 @@ ftrace_regs_set_instruction_pointer(struct ftrace_regs *fregs, unsigned long ip) > regs_get_kernel_argument(&(fregs)->regs, n) > #define ftrace_regs_get_stack_pointer(fregs) \ > kernel_stack_pointer(&(fregs)->regs) > -#define ftrace_regs_return_value(fregs) \ > +#define ftrace_regs_get_return_value(fregs) \ > regs_return_value(&(fregs)->regs) > #define ftrace_regs_set_return_value(fregs, ret) \ > regs_set_return_value(&(fregs)->regs, ret) > diff --git a/arch/powerpc/include/asm/ftrace.h b/arch/powerpc/include/asm/ftrace.h > index 9e5a39b6a311..7e138e0e3baf 100644 > --- a/arch/powerpc/include/asm/ftrace.h > +++ b/arch/powerpc/include/asm/ftrace.h > @@ -69,7 +69,7 @@ ftrace_regs_get_instruction_pointer(struct ftrace_regs *fregs) > regs_get_kernel_argument(&(fregs)->regs, n) > #define ftrace_regs_get_stack_pointer(fregs) \ > kernel_stack_pointer(&(fregs)->regs) > -#define ftrace_regs_return_value(fregs) \ > +#define ftrace_regs_get_return_value(fregs) \ > regs_return_value(&(fregs)->regs) > #define ftrace_regs_set_return_value(fregs, ret) \ > regs_set_return_value(&(fregs)->regs, ret) > diff --git a/arch/s390/include/asm/ftrace.h b/arch/s390/include/asm/ftrace.h > index 5a82b08f03cd..01e775c98425 100644 > --- a/arch/s390/include/asm/ftrace.h > +++ b/arch/s390/include/asm/ftrace.h > @@ -88,7 +88,7 @@ ftrace_regs_set_instruction_pointer(struct ftrace_regs *fregs, > regs_get_kernel_argument(&(fregs)->regs, n) > #define ftrace_regs_get_stack_pointer(fregs) \ > kernel_stack_pointer(&(fregs)->regs) > -#define ftrace_regs_return_value(fregs) \ > +#define ftrace_regs_get_return_value(fregs) \ > regs_return_value(&(fregs)->regs) > #define ftrace_regs_set_return_value(fregs, ret) \ > regs_set_return_value(&(fregs)->regs, ret) > diff --git a/arch/x86/include/asm/ftrace.h b/arch/x86/include/asm/ftrace.h > index 0b306c82855d..a061f8832b20 100644 > --- a/arch/x86/include/asm/ftrace.h > +++ b/arch/x86/include/asm/ftrace.h > @@ -64,7 +64,7 @@ arch_ftrace_get_regs(struct ftrace_regs *fregs) > regs_get_kernel_argument(&(fregs)->regs, n) > #define ftrace_regs_get_stack_pointer(fregs) \ > kernel_stack_pointer(&(fregs)->regs) > -#define ftrace_regs_return_value(fregs) \ > +#define ftrace_regs_get_return_value(fregs) \ > regs_return_value(&(fregs)->regs) > #define ftrace_regs_set_return_value(fregs, ret) \ > regs_set_return_value(&(fregs)->regs, ret) > diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h > index 79875a00c02b..da2a23f5a9ed 100644 > --- a/include/linux/ftrace.h > +++ b/include/linux/ftrace.h > @@ -187,7 +187,7 @@ static __always_inline bool ftrace_regs_has_args(struct ftrace_regs *fregs) > regs_get_kernel_argument(ftrace_get_regs(fregs), n) > #define ftrace_regs_get_stack_pointer(fregs) \ > kernel_stack_pointer(ftrace_get_regs(fregs)) > -#define ftrace_regs_return_value(fregs) \ > +#define ftrace_regs_get_return_value(fregs) \ > regs_return_value(ftrace_get_regs(fregs)) > #define ftrace_regs_set_return_value(fregs, ret) \ > regs_set_return_value(ftrace_get_regs(fregs), ret) > diff --git a/kernel/trace/fgraph.c b/kernel/trace/fgraph.c > index 088432b695a6..9a60acaacc96 100644 > --- a/kernel/trace/fgraph.c > +++ b/kernel/trace/fgraph.c > @@ -783,7 +783,7 @@ static void fgraph_call_retfunc(struct ftrace_regs *fregs, > trace.rettime = trace_clock_local(); > #ifdef CONFIG_FUNCTION_GRAPH_RETVAL > if (fregs) > - trace.retval = ftrace_regs_return_value(fregs); > + trace.retval = ftrace_regs_get_return_value(fregs); > else > trace.retval = fgraph_ret_regs_return_value(ret_regs); > #endif >
