From: Mathieu Desnoyers Date: Tue, 15 Apr 2014 15:34:39 +0000 (-0400) Subject: Fix: update v4l2 instrumentation to 3.15 kernel X-Git-Tag: v2.5.0-rc1~11 X-Git-Url: http://git.lttng.org/?p=lttng-modules.git;a=commitdiff_plain;h=ec6b19d2535d75c71b92c1cc48dc3f4a39476d76 Fix: update v4l2 instrumentation to 3.15 kernel show_type() is only used in TP_printk(), which is not used by LTTng modules. Moreover, it is already defined by the in-kernel instrumentation. Therefore, we can remove it from the lttng instrumentation. Signed-off-by: Mathieu Desnoyers --- diff --git a/instrumentation/events/lttng-module/v4l2.h b/instrumentation/events/lttng-module/v4l2.h index b5a5d81c..edc57c86 100644 --- a/instrumentation/events/lttng-module/v4l2.h +++ b/instrumentation/events/lttng-module/v4l2.h @@ -6,20 +6,6 @@ #include -#define show_type(type) \ - __print_symbolic(type, \ - { V4L2_BUF_TYPE_VIDEO_CAPTURE, "VIDEO_CAPTURE" }, \ - { V4L2_BUF_TYPE_VIDEO_OUTPUT, "VIDEO_OUTPUT" }, \ - { V4L2_BUF_TYPE_VIDEO_OVERLAY, "VIDEO_OVERLAY" }, \ - { V4L2_BUF_TYPE_VBI_CAPTURE, "VBI_CAPTURE" }, \ - { V4L2_BUF_TYPE_VBI_OUTPUT, "VBI_OUTPUT" }, \ - { V4L2_BUF_TYPE_SLICED_VBI_CAPTURE, "SLICED_VBI_CAPTURE" }, \ - { V4L2_BUF_TYPE_SLICED_VBI_OUTPUT, "SLICED_VBI_OUTPUT" }, \ - { V4L2_BUF_TYPE_VIDEO_OUTPUT_OVERLAY, "VIDEO_OUTPUT_OVERLAY" },\ - { V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE, "VIDEO_CAPTURE_MPLANE" },\ - { V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, "VIDEO_OUTPUT_MPLANE" }, \ - { V4L2_BUF_TYPE_PRIVATE, "PRIVATE" }) - #define show_field(field) \ __print_symbolic(field, \ { V4L2_FIELD_ANY, "ANY" }, \