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

Commit 157587d7 authored by Steven Rostedt's avatar Steven Rostedt
Browse files

tracing: remove obsolete TRACE_EVENT_FORMAT macro 



Impact: clean up

The TRACE_EVENT_FORMAT macro is no longer used by trace points
and only the DECLARE_TRACE, TRACE_FORMAT or TRACE_EVENT macros should
be used by them. Although the TRACE_EVENT_FORMAT macro is still used
by the internal tracing utility, it should not be used in core
kernel code.

Signed-off-by: default avatarSteven Rostedt <srostedt@redhat.com>
parent d6e2ca4c

include/linux/tracepoint.h

+0 −3
Original line number Diff line number Diff line
@@ -157,9 +157,6 @@ static inline void tracepoint_synchronize_unregister(void) 
#define TRACE_FORMAT(name, proto, args, fmt)		\

	DECLARE_TRACE(name, PARAMS(proto), PARAMS(args))



#define TRACE_EVENT_FORMAT(name, proto, args, fmt, struct, tpfmt)	\

	TRACE_FORMAT(name, PARAMS(proto), PARAMS(args), PARAMS(fmt))



#define TRACE_EVENT(name, proto, args, struct, print, assign)	\

	DECLARE_TRACE(name, PARAMS(proto), PARAMS(args))

include/trace/lockdep_event_types.h

+1 −1
Original line number Diff line number Diff line 


#ifndef TRACE_EVENT_FORMAT

#ifndef TRACE_FORMAT

# error Do not include this file directly.

# error Unless you know what you are doing.

#endif

include/trace/sched_event_types.h

+1 −1
Original line number Diff line number Diff line 


/* use <trace/sched.h> instead */

#ifndef TRACE_EVENT_FORMAT

#ifndef TRACE_EVENT

# error Do not include this file directly.

# error Unless you know what you are doing.

#endif

kernel/trace/trace_events_stage_1.h

+0 −3
Original line number Diff line number Diff line
@@ -17,9 +17,6 @@ 
#undef TRACE_FORMAT

#define TRACE_FORMAT(call, proto, args, fmt)



#undef TRACE_EVENT_FORMAT

#define TRACE_EVENT_FORMAT(name, proto, args, fmt, tstruct, tpfmt)



#undef __array

#define __array(type, item, len)	type	item[len];

kernel/trace/trace_events_stage_3.h

+1 −5
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
 * }

 *

 *

 * For those macros defined with TRACE_EVENT_FORMAT:

 * For those macros defined with TRACE_EVENT:

 *

 * static struct ftrace_event_call event_<call>;

 *
@@ -144,10 +144,6 @@ __attribute__((section("_ftrace_events"))) event_##call = { \ 
	.unregfunc		= ftrace_unreg_event_##call,		\

}



#undef TRACE_EVENT_FORMAT

#define TRACE_EVENT_FORMAT(call, proto, args, fmt, tstruct, raw)	\

	TRACE_FORMAT(call, PARAMS(proto), PARAMS(args), PARAMS(fmt))



#undef __entry

#define __entry entry