These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / media / platform / coda / trace.h

diff --git a/kernel/drivers/media/platform/coda/trace.h b/kernel/drivers/media/platform/coda/trace.h
index d1d06cb..f20666a 100644 (file)
--- a/kernel/drivers/media/platform/coda/trace.h
+++ b/kernel/drivers/media/platform/coda/trace.h
@@ -5,12 +5,10 @@
 #define __CODA_TRACE_H__
 
 #include <linux/tracepoint.h>
-#include <media/videobuf2-core.h>
+#include <media/videobuf2-v4l2.h>
 
 #include "coda.h"
 
-#define TRACE_SYSTEM_STRING __stringify(TRACE_SYSTEM)
-
 TRACE_EVENT(coda_bit_run,
        TP_PROTO(struct coda_ctx *ctx, int cmd),
 
@@ -50,8 +48,8 @@ TRACE_EVENT(coda_bit_done,
        TP_printk("minor = %d, ctx = %d", __entry->minor, __entry->ctx)
 );
 
-TRACE_EVENT(coda_enc_pic_run,
-       TP_PROTO(struct coda_ctx *ctx, struct vb2_buffer *buf),
+DECLARE_EVENT_CLASS(coda_buf_class,
+       TP_PROTO(struct coda_ctx *ctx, struct vb2_v4l2_buffer *buf),
 
        TP_ARGS(ctx, buf),
 
@@ -63,7 +61,7 @@ TRACE_EVENT(coda_enc_pic_run,
 
        TP_fast_assign(
                __entry->minor = ctx->fh.vdev->minor;
-               __entry->index = buf->v4l2_buf.index;
+               __entry->index = buf->vb2_buf.index;
                __entry->ctx = ctx->idx;
        ),
 
@@ -71,29 +69,18 @@ TRACE_EVENT(coda_enc_pic_run,
                  __entry->minor, __entry->index, __entry->ctx)
 );
 
-TRACE_EVENT(coda_enc_pic_done,
-       TP_PROTO(struct coda_ctx *ctx, struct vb2_buffer *buf),
-
-       TP_ARGS(ctx, buf),
-
-       TP_STRUCT__entry(
-               __field(int, minor)
-               __field(int, index)
-               __field(int, ctx)
-       ),
-
-       TP_fast_assign(
-               __entry->minor = ctx->fh.vdev->minor;
-               __entry->index = buf->v4l2_buf.index;
-               __entry->ctx = ctx->idx;
-       ),
+DEFINE_EVENT(coda_buf_class, coda_enc_pic_run,
+       TP_PROTO(struct coda_ctx *ctx, struct vb2_v4l2_buffer *buf),
+       TP_ARGS(ctx, buf)
+);
 
-       TP_printk("minor = %d, index = %d, ctx = %d",
-                 __entry->minor, __entry->index, __entry->ctx)
+DEFINE_EVENT(coda_buf_class, coda_enc_pic_done,
+       TP_PROTO(struct coda_ctx *ctx, struct vb2_v4l2_buffer *buf),
+       TP_ARGS(ctx, buf)
 );
 
-TRACE_EVENT(coda_bit_queue,
-       TP_PROTO(struct coda_ctx *ctx, struct vb2_buffer *buf,
+DECLARE_EVENT_CLASS(coda_buf_meta_class,
+       TP_PROTO(struct coda_ctx *ctx, struct vb2_v4l2_buffer *buf,
                 struct coda_buffer_meta *meta),
 
        TP_ARGS(ctx, buf, meta),
@@ -108,7 +95,7 @@ TRACE_EVENT(coda_bit_queue,
 
        TP_fast_assign(
                __entry->minor = ctx->fh.vdev->minor;
-               __entry->index = buf->v4l2_buf.index;
+               __entry->index = buf->vb2_buf.index;
                __entry->start = meta->start;
                __entry->end = meta->end;
                __entry->ctx = ctx->idx;
@@ -119,7 +106,13 @@ TRACE_EVENT(coda_bit_queue,
                  __entry->ctx)
 );
 
-TRACE_EVENT(coda_dec_pic_run,
+DEFINE_EVENT(coda_buf_meta_class, coda_bit_queue,
+       TP_PROTO(struct coda_ctx *ctx, struct vb2_v4l2_buffer *buf,
+                struct coda_buffer_meta *meta),
+       TP_ARGS(ctx, buf, meta)
+);
+
+DECLARE_EVENT_CLASS(coda_meta_class,
        TP_PROTO(struct coda_ctx *ctx, struct coda_buffer_meta *meta),
 
        TP_ARGS(ctx, meta),
@@ -142,54 +135,20 @@ TRACE_EVENT(coda_dec_pic_run,
                  __entry->minor, __entry->start, __entry->end, __entry->ctx)
 );
 
-TRACE_EVENT(coda_dec_pic_done,
+DEFINE_EVENT(coda_meta_class, coda_dec_pic_run,
        TP_PROTO(struct coda_ctx *ctx, struct coda_buffer_meta *meta),
-
-       TP_ARGS(ctx, meta),
-
-       TP_STRUCT__entry(
-               __field(int, minor)
-               __field(int, start)
-               __field(int, end)
-               __field(int, ctx)
-       ),
-
-       TP_fast_assign(
-               __entry->minor = ctx->fh.vdev->minor;
-               __entry->start = meta->start;
-               __entry->end = meta->end;
-               __entry->ctx = ctx->idx;
-       ),
-
-       TP_printk("minor = %d, start = 0x%x, end = 0x%x, ctx = %d",
-                 __entry->minor, __entry->start, __entry->end, __entry->ctx)
+       TP_ARGS(ctx, meta)
 );
 
-TRACE_EVENT(coda_dec_rot_done,
-       TP_PROTO(struct coda_ctx *ctx, struct coda_buffer_meta *meta,
-                struct vb2_buffer *buf),
-
-       TP_ARGS(ctx, meta, buf),
-
-       TP_STRUCT__entry(
-               __field(int, minor)
-               __field(int, start)
-               __field(int, end)
-               __field(int, index)
-               __field(int, ctx)
-       ),
-
-       TP_fast_assign(
-               __entry->minor = ctx->fh.vdev->minor;
-               __entry->start = meta->start;
-               __entry->end = meta->end;
-               __entry->index = buf->v4l2_buf.index;
-               __entry->ctx = ctx->idx;
-       ),
+DEFINE_EVENT(coda_meta_class, coda_dec_pic_done,
+       TP_PROTO(struct coda_ctx *ctx, struct coda_buffer_meta *meta),
+       TP_ARGS(ctx, meta)
+);
 
-       TP_printk("minor = %d, start = 0x%x, end = 0x%x, index = %d, ctx = %d",
-                 __entry->minor, __entry->start, __entry->end, __entry->index,
-                 __entry->ctx)
+DEFINE_EVENT(coda_buf_meta_class, coda_dec_rot_done,
+       TP_PROTO(struct coda_ctx *ctx, struct vb2_v4l2_buffer *buf,
+                struct coda_buffer_meta *meta),
+       TP_ARGS(ctx, buf, meta)
 );
 
 #endif /* __CODA_TRACE_H__ */