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

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

tracing: Remove test of NULL define_fields callback 



Every event (or event class) has it's define_fields callback,
so the test is redundant.

Signed-off-by: default avatarLi Zefan <lizf@cn.fujitsu.com>
LKML-Reference: <4BFA37BC.8080707@cn.fujitsu.com>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent 210f7669

kernel/trace/trace_events.c

+13 −15
Original line number Original line Diff line number Diff line
@@ -987,7 +987,6 @@ event_create_dir(struct ftrace_event_call *call, struct dentry *d_events, 
		 		  id);

		 		  id);

#endif

#endif





	if (call->class->define_fields) {

	/*

	/*

	 * Other events may have the same class. Only update

	 * Other events may have the same class. Only update

	 * the fields if they are not already defined.

	 * the fields if they are not already defined.
@@ -1003,7 +1002,6 @@ event_create_dir(struct ftrace_event_call *call, struct dentry *d_events, 
	}

	}

	trace_create_file("filter", 0644, call->dir, call,

	trace_create_file("filter", 0644, call->dir, call,

			  filter);

			  filter);

	}





	trace_create_file("format", 0444, call->dir, call,

	trace_create_file("format", 0444, call->dir, call,

			  format);

			  format);

kernel/trace/trace_events_filter.c

+0 −9
Original line number Original line Diff line number Diff line
@@ -639,9 +639,6 @@ static int init_subsystem_preds(struct event_subsystem *system) 
	int err;

	int err;





	list_for_each_entry(call, &ftrace_events, list) {

	list_for_each_entry(call, &ftrace_events, list) {

		if (!call->class || !call->class->define_fields)

			continue;



		if (strcmp(call->class->system, system->name) != 0)

		if (strcmp(call->class->system, system->name) != 0)

			continue;

			continue;
@@ -658,9 +655,6 @@ static void filter_free_subsystem_preds(struct event_subsystem *system) 
	struct ftrace_event_call *call;

	struct ftrace_event_call *call;





	list_for_each_entry(call, &ftrace_events, list) {

	list_for_each_entry(call, &ftrace_events, list) {

		if (!call->class || !call->class->define_fields)

			continue;



		if (strcmp(call->class->system, system->name) != 0)

		if (strcmp(call->class->system, system->name) != 0)

			continue;

			continue;
@@ -1263,9 +1257,6 @@ static int replace_system_preds(struct event_subsystem *system, 
	list_for_each_entry(call, &ftrace_events, list) {

	list_for_each_entry(call, &ftrace_events, list) {

		struct event_filter *filter = call->filter;

		struct event_filter *filter = call->filter;





		if (!call->class || !call->class->define_fields)

			continue;



		if (strcmp(call->class->system, system->name) != 0)

		if (strcmp(call->class->system, system->name) != 0)

			continue;

			continue;