From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S933797AbbENPUS (ORCPT <rfc822;w@1wt.eu>);
	Thu, 14 May 2015 11:20:18 -0400
Received: from mail.kernel.org ([198.145.29.136]:41263 "EHLO mail.kernel.org"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S933585AbbENPT2 (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Thu, 14 May 2015 11:19:28 -0400
Message-Id: <20150514151921.109005243@goodmis.org>
User-Agent: quilt/0.61-1
Date: Thu, 14 May 2015 11:13:33 -0400
From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org
Cc: Ingo Molnar <mingo@kernel.org>, Andrew Morton <akpm@linux-foundation.org>,
        Peter Zijlstra <peterz@infradead.org>,
        Namhyung Kim <namhyung@kernel.org>,
        Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>,
        Arnaldo Carvalho de Melo <acme@kernel.org>,
        Jiri Olsa <jolsa@kernel.org>, Daniel Wagner <wagi@monom.org>
Subject: [RFC][PATCH 18/19] tracing: Rename ftrace_define_fields_##call() to
 trace_event_define_fields_##call()
References: <20150514151315.746637810@goodmis.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-15
Content-Disposition: inline; filename=0018-tracing-Rename-ftrace_define_fields_-call-to-trace_e.patch
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: "Steven Rostedt (Red Hat)" <rostedt@goodmis.org>

The name "ftrace" really refers to the function hook infrastructure. It
is not about the trace_events. The function ftrace_define_fields_##call()
is used to define how to process the trace_event fields. It has nothing to
do with function tracing. Rename it.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
 include/trace/perf.h         | 4 ++--
 include/trace/trace_events.h | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/trace/perf.h b/include/trace/perf.h
index c9af07652f08..4ad27492a63d 100644
--- a/include/trace/perf.h
+++ b/include/trace/perf.h
@@ -65,7 +65,7 @@
  *
  * static struct trace_event_class __used event_class_<template> = {
  *	.system			= "<system>",
- *	.define_fields		= ftrace_define_fields_<call>,
+ *	.define_fields		= trace_event_define_fields_<call>,
  *	.fields			= LIST_HEAD_INIT(event_class_##call.fields),
  *	.raw_init		= trace_event_raw_init,
  *	.probe			= trace_event_raw_event_##call,
@@ -215,7 +215,7 @@ _TRACE_PERF_PROTO(call, PARAMS(proto));					\
 static char print_fmt_##call[] = print;					\
 static struct trace_event_class __used __refdata event_class_##call = { \
 	.system			= TRACE_SYSTEM_STRING,			\
-	.define_fields		= ftrace_define_fields_##call,		\
+	.define_fields		= trace_event_define_fields_##call,	\
 	.fields			= LIST_HEAD_INIT(event_class_##call.fields),\
 	.raw_init		= trace_event_raw_init,			\
 	.probe			= trace_event_raw_event_##call,		\
diff --git a/include/trace/trace_events.h b/include/trace/trace_events.h
index d88bd0f0844d..e27b87ef5724 100644
--- a/include/trace/trace_events.h
+++ b/include/trace/trace_events.h
@@ -407,7 +407,7 @@ static struct trace_event_functions trace_event_type_funcs_##call = {	\
 #undef DECLARE_EVENT_CLASS
 #define DECLARE_EVENT_CLASS(call, proto, args, tstruct, func, print)	\
 static int notrace __init						\
-ftrace_define_fields_##call(struct trace_event_call *event_call)	\
+trace_event_define_fields_##call(struct trace_event_call *event_call)	\
 {									\
 	struct trace_event_raw_##call field;				\
 	int ret;							\
-- 
2.1.4