Commit b8e65554d80b4c560d201362d0e8fa02109d89fd
Committed by
Steven Rostedt
1 parent
160031b556
Exists in
master
and in
39 other branches
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>
Showing 3 changed files with 0 additions and 75 deletions Side-by-side Diff
include/linux/tracepoint.h
... | ... | @@ -158,11 +158,6 @@ |
158 | 158 | |
159 | 159 | #define PARAMS(args...) args |
160 | 160 | |
161 | -#ifndef TRACE_FORMAT | |
162 | -#define TRACE_FORMAT(name, proto, args, fmt) \ | |
163 | - DECLARE_TRACE(name, PARAMS(proto), PARAMS(args)) | |
164 | -#endif | |
165 | - | |
166 | 161 | #ifndef TRACE_EVENT |
167 | 162 | /* |
168 | 163 | * For use with the TRACE_EVENT macro: |
include/trace/define_trace.h
... | ... | @@ -26,10 +26,6 @@ |
26 | 26 | #define TRACE_EVENT(name, proto, args, tstruct, assign, print) \ |
27 | 27 | DEFINE_TRACE(name) |
28 | 28 | |
29 | -#undef TRACE_FORMAT | |
30 | -#define TRACE_FORMAT(name, proto, args, print) \ | |
31 | - DEFINE_TRACE(name) | |
32 | - | |
33 | 29 | #undef DECLARE_TRACE |
34 | 30 | #define DECLARE_TRACE(name, proto, args) \ |
35 | 31 | DEFINE_TRACE(name) |
include/trace/ftrace.h
... | ... | @@ -18,9 +18,6 @@ |
18 | 18 | |
19 | 19 | #include <linux/ftrace_event.h> |
20 | 20 | |
21 | -#undef TRACE_FORMAT | |
22 | -#define TRACE_FORMAT(call, proto, args, fmt) | |
23 | - | |
24 | 21 | #undef __array |
25 | 22 | #define __array(type, item, len) type item[len]; |
26 | 23 | |
... | ... | @@ -62,9 +59,6 @@ |
62 | 59 | * |
63 | 60 | */ |
64 | 61 | |
65 | -#undef TRACE_FORMAT | |
66 | -#define TRACE_FORMAT(call, proto, args, fmt) | |
67 | - | |
68 | 62 | #undef __array |
69 | 63 | #define __array(type, item, len) |
70 | 64 | |
71 | 65 | |
... | ... | @@ -298,17 +292,7 @@ |
298 | 292 | * unregister_trace_<call>(ftrace_event_<call>); |
299 | 293 | * } |
300 | 294 | * |
301 | - * For those macros defined with TRACE_FORMAT: | |
302 | 295 | * |
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 | - * | |
311 | - * | |
312 | 296 | * For those macros defined with TRACE_EVENT: |
313 | 297 | * |
314 | 298 | * static struct ftrace_event_call event_<call>; |
... | ... | @@ -416,56 +400,6 @@ |
416 | 400 | #define _TRACE_PROFILE(call, proto, args) |
417 | 401 | #define _TRACE_PROFILE_INIT(call) |
418 | 402 | #endif |
419 | - | |
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 | 403 | |
470 | 404 | #undef __entry |
471 | 405 | #define __entry entry |