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

Commit ffb9f995 authored by Li Zefan's avatar Li Zefan Committed by Steven Rostedt
Browse files

tracing: Remove redundant raw_init callbacks 



raw_init callback is optional.

Signed-off-by: default avatarLi Zefan <lizf@cn.fujitsu.com>
LKML-Reference: <4BFA37D4.7070500@cn.fujitsu.com>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent c9d932cf

kernel/trace/trace_export.c

+1 −7
Original line number Diff line number Diff line
@@ -125,12 +125,6 @@ ftrace_define_fields_##name(struct ftrace_event_call *event_call) \ 


#include "trace_entries.h"



static int ftrace_raw_init_event(struct ftrace_event_call *call)

{

	INIT_LIST_HEAD(&call->class->fields);

	return 0;

}



#undef __entry

#define __entry REC
@@ -158,7 +152,7 @@ static int ftrace_raw_init_event(struct ftrace_event_call *call) 
struct ftrace_event_class event_class_ftrace_##call = {			\

	.system			= __stringify(TRACE_SYSTEM),		\

	.define_fields		= ftrace_define_fields_##call,		\

	.raw_init		= ftrace_raw_init_event,		\

	.fields			= LIST_HEAD_INIT(event_class_ftrace_##call.fields),\

};									\

									\

struct ftrace_event_call __used						\

kernel/trace/trace_kprobe.c

+1 −9
Original line number Diff line number Diff line
@@ -1214,11 +1214,6 @@ static void probe_event_disable(struct ftrace_event_call *call) 
	}

}



static int probe_event_raw_init(struct ftrace_event_call *event_call)

{

	return 0;

}



#undef DEFINE_FIELD

#define DEFINE_FIELD(type, item, name, is_signed)			\

	do {								\
@@ -1486,15 +1481,12 @@ static int register_probe_event(struct trace_probe *tp) 
	int ret;



	/* Initialize ftrace_event_call */

	if (probe_is_return(tp)) {

	INIT_LIST_HEAD(&call->class->fields);

	if (probe_is_return(tp)) {

		call->event.funcs = &kretprobe_funcs;

		call->class->raw_init = probe_event_raw_init;

		call->class->define_fields = kretprobe_event_define_fields;

	} else {

		INIT_LIST_HEAD(&call->class->fields);

		call->event.funcs = &kprobe_funcs;

		call->class->raw_init = probe_event_raw_init;

		call->class->define_fields = kprobe_event_define_fields;

	}

	if (set_print_fmt(tp) < 0)