Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af64a7cb authored by Jiri Slaby's avatar Jiri Slaby Committed by Steven Rostedt
Browse files

ftrace: Pass retval through return in ftrace_dyn_arch_init() 

No architecture uses the "data" parameter in ftrace_dyn_arch_init() in any
way, it just sets the value to 0. And this is used as a return value
in the caller -- ftrace_init, which just checks the retval against
zero.

Note there is also "return 0" in every ftrace_dyn_arch_init.  So it is
enough to check the retval and remove all the indirect sets of data on
all archs.

Link: http://lkml.kernel.org/r/1393268401-24379-3-git-send-email-jslaby@suse.cz



Cc: linux-arch@vger.kernel.org
Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent c867ccd8

Documentation/trace/ftrace-design.txt

+0 −3
Original line number Diff line number Diff line
@@ -360,9 +360,6 @@ function below should be sufficient for most people: 


int __init ftrace_dyn_arch_init(void *data)

{

	/* return value is done indirectly via data */

	*(unsigned long *)data = 0;



	return 0;

}

arch/arm/kernel/ftrace.c

+0 −2
Original line number Diff line number Diff line
@@ -158,8 +158,6 @@ int ftrace_make_nop(struct module *mod, 


int __init ftrace_dyn_arch_init(void *data)

{

	*(unsigned long *)data = 0;



	return 0;

}

#endif /* CONFIG_DYNAMIC_FTRACE */

arch/blackfin/kernel/ftrace.c

+0 −3
Original line number Diff line number Diff line
@@ -67,9 +67,6 @@ int ftrace_update_ftrace_func(ftrace_func_t func) 


int __init ftrace_dyn_arch_init(void *data)

{

	/* return value is done indirectly via data */

	*(unsigned long *)data = 0;



	return 0;

}

arch/ia64/kernel/ftrace.c

+0 −2
Original line number Diff line number Diff line
@@ -200,7 +200,5 @@ int ftrace_update_ftrace_func(ftrace_func_t func) 
/* run from kstop_machine */

int __init ftrace_dyn_arch_init(void *data)

{

	*(unsigned long *)data = 0;



	return 0;

}

arch/metag/kernel/ftrace.c

+0 −3
Original line number Diff line number Diff line
@@ -119,8 +119,5 @@ int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr) 
/* run from kstop_machine */

int __init ftrace_dyn_arch_init(void *data)

{

	/* The return code is returned via data */

	writel(0, data);



	return 0;

}