[PATCH] ftrace: Join functions ftrace_module_init and ftrace_init_module

[PATCH] ftrace: Join functions ftrace_module_init and ftrace_init_module

[Abel Vesa]

Simple cleanup. No need for two functions here.
The whole work can simply be done inside 'ftrace_module_init'.

Signed-off-by: Abel Vesa <abelvesa@linux.com>
---
 kernel/trace/ftrace.c | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index e371aed..f558195 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -5008,19 +5008,16 @@ void ftrace_release_mod(struct module *mod)
 	mutex_unlock(&ftrace_lock);
 }
 
-static void ftrace_init_module(struct module *mod,
-			       unsigned long *start, unsigned long *end)
+void ftrace_module_init(struct module *mod)
 {
+	unsigned long *start = mod->ftrace_callsites;
+	unsigned long *end = mod->ftrace_callsites +
+				mod->num_ftrace_callsites;
+
 	if (ftrace_disabled || start == end)
 		return;
-	ftrace_process_locs(mod, start, end);
-}
 
-void ftrace_module_init(struct module *mod)
-{
-	ftrace_init_module(mod, mod->ftrace_callsites,
-			   mod->ftrace_callsites +
-			   mod->num_ftrace_callsites);
+	ftrace_process_locs(mod, start, end);
 }
 
 static int ftrace_module_notify_exit(struct notifier_block *self,
-- 
1.9.1

Re: [PATCH] ftrace: Join functions ftrace_module_init and ftrace_init_module

[Steven Rostedt]

On Wed,  2 Dec 2015 15:39:57 +0100
Abel Vesa <abelvesa@linux.com> wrote:

> Simple cleanup. No need for two functions here.
> The whole work can simply be done inside 'ftrace_module_init'.

Thanks! Applied.

-- Steve