From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758597AbbLBOkM (ORCPT ); Wed, 2 Dec 2015 09:40:12 -0500 Received: from mail-wm0-f53.google.com ([74.125.82.53]:36371 "EHLO mail-wm0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932329AbbLBOkK (ORCPT ); Wed, 2 Dec 2015 09:40:10 -0500 From: Abel Vesa To: rostedt@goodmis.org Cc: linux-kernel@vger.kernel.org, Abel Vesa Subject: [PATCH] ftrace: Join functions ftrace_module_init and ftrace_init_module Date: Wed, 2 Dec 2015 15:39:57 +0100 Message-Id: <1449067197-5718-1-git-send-email-abelvesa@linux.com> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Simple cleanup. No need for two functions here. The whole work can simply be done inside 'ftrace_module_init'. Signed-off-by: Abel Vesa --- 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