Skip to content

Commit b8e6555

Browse files
Steven Rostedtrostedt
authored andcommitted
tracing: remove deprecated TRACE_FORMAT
The TRACE_FORMAT macro has been deprecated by the TRACE_EVENT macro. There are no more users. All new users must use the TRACE_EVENT macro. [ Impact: remove old functionality ] Cc: Peter Zijlstra <peterz@infradead.org> Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
1 parent 160031b commit b8e6555

File tree

3 files changed

+0
-75
lines changed

3 files changed

+0
-75
lines changed

include/linux/tracepoint.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -158,11 +158,6 @@ static inline void tracepoint_synchronize_unregister(void)
158158

159159
#define PARAMS(args...) args
160160

161-
#ifndef TRACE_FORMAT
162-
#define TRACE_FORMAT(name, proto, args, fmt) \
163-
DECLARE_TRACE(name, PARAMS(proto), PARAMS(args))
164-
#endif
165-
166161
#ifndef TRACE_EVENT
167162
/*
168163
* For use with the TRACE_EVENT macro:

include/trace/define_trace.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,6 @@
2626
#define TRACE_EVENT(name, proto, args, tstruct, assign, print) \
2727
DEFINE_TRACE(name)
2828

29-
#undef TRACE_FORMAT
30-
#define TRACE_FORMAT(name, proto, args, print) \
31-
DEFINE_TRACE(name)
32-
3329
#undef DECLARE_TRACE
3430
#define DECLARE_TRACE(name, proto, args) \
3531
DEFINE_TRACE(name)

include/trace/ftrace.h

Lines changed: 0 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@
1818

1919
#include <linux/ftrace_event.h>
2020

21-
#undef TRACE_FORMAT
22-
#define TRACE_FORMAT(call, proto, args, fmt)
23-
2421
#undef __array
2522
#define __array(type, item, len) type item[len];
2623

@@ -62,9 +59,6 @@
6259
*
6360
*/
6461

65-
#undef TRACE_FORMAT
66-
#define TRACE_FORMAT(call, proto, args, fmt)
67-
6862
#undef __array
6963
#define __array(type, item, len)
7064

@@ -298,16 +292,6 @@ ftrace_define_fields_##call(void) \
298292
* unregister_trace_<call>(ftrace_event_<call>);
299293
* }
300294
*
301-
* For those macros defined with TRACE_FORMAT:
302-
*
303-
* static struct ftrace_event_call __used
304-
* __attribute__((__aligned__(4)))
305-
* __attribute__((section("_ftrace_events"))) event_<call> = {
306-
* .name = "<call>",
307-
* .regfunc = ftrace_reg_event_<call>,
308-
* .unregfunc = ftrace_unreg_event_<call>,
309-
* }
310-
*
311295
*
312296
* For those macros defined with TRACE_EVENT:
313297
*
@@ -417,56 +401,6 @@ static void ftrace_profile_disable_##call(struct ftrace_event_call *call) \
417401
#define _TRACE_PROFILE_INIT(call)
418402
#endif
419403

420-
#define _TRACE_FORMAT(call, proto, args, fmt) \
421-
static void ftrace_event_##call(proto) \
422-
{ \
423-
event_trace_printk(_RET_IP_, #call ": " fmt); \
424-
} \
425-
\
426-
static int ftrace_reg_event_##call(void) \
427-
{ \
428-
int ret; \
429-
\
430-
ret = register_trace_##call(ftrace_event_##call); \
431-
if (ret) \
432-
pr_info("event trace: Could not activate trace point " \
433-
"probe to " #call "\n"); \
434-
return ret; \
435-
} \
436-
\
437-
static void ftrace_unreg_event_##call(void) \
438-
{ \
439-
unregister_trace_##call(ftrace_event_##call); \
440-
} \
441-
\
442-
static struct ftrace_event_call event_##call; \
443-
\
444-
static int ftrace_init_event_##call(void) \
445-
{ \
446-
int id; \
447-
\
448-
id = register_ftrace_event(NULL); \
449-
if (!id) \
450-
return -ENODEV; \
451-
event_##call.id = id; \
452-
return 0; \
453-
}
454-
455-
#undef TRACE_FORMAT
456-
#define TRACE_FORMAT(call, proto, args, fmt) \
457-
_TRACE_FORMAT(call, PARAMS(proto), PARAMS(args), PARAMS(fmt)) \
458-
_TRACE_PROFILE(call, PARAMS(proto), PARAMS(args)) \
459-
static struct ftrace_event_call __used \
460-
__attribute__((__aligned__(4))) \
461-
__attribute__((section("_ftrace_events"))) event_##call = { \
462-
.name = #call, \
463-
.system = __stringify(TRACE_SYSTEM), \
464-
.raw_init = ftrace_init_event_##call, \
465-
.regfunc = ftrace_reg_event_##call, \
466-
.unregfunc = ftrace_unreg_event_##call, \
467-
_TRACE_PROFILE_INIT(call) \
468-
}
469-
470404
#undef __entry
471405
#define __entry entry
472406

0 commit comments

Comments
 (0)