On Mon, Aug 08, 2016 at 06:24:19PM -0300, Gustavo Padovan wrote:
> From: Gustavo Padovan <gustavo.padovan@xxxxxxxxxxxxxxx>
>
> The common behaviour for trace headers is to have them in the same folder
> they are used, instead of creating a special trace/ directory.
>
> Signed-off-by: Gustavo Padovan <gustavo.padovan@xxxxxxxxxxxxxxx>
Reviewed-by: Eric Engestrom <eric.engestrom@xxxxxxxxxx>
> ---
> drivers/staging/android/sw_sync.c | 2 +-
> drivers/staging/android/sync_trace.h | 32 ++++++++++++++++++++++++++++++++
> drivers/staging/android/trace/sync.h | 32 --------------------------------
> 3 files changed, 33 insertions(+), 33 deletions(-)
> create mode 100644 drivers/staging/android/sync_trace.h
> delete mode 100644 drivers/staging/android/trace/sync.h
>
> diff --git a/drivers/staging/android/sw_sync.c b/drivers/staging/android/sw_sync.c
> index ad0bb1a..745597b 100644
> --- a/drivers/staging/android/sw_sync.c
> +++ b/drivers/staging/android/sw_sync.c
> @@ -23,7 +23,7 @@
> #include "sync_debug.h"
>
> #define CREATE_TRACE_POINTS
> -#include "trace/sync.h"
> +#include "sync_trace.h"
>
> struct sw_sync_create_fence_data {
> __u32 value;
> diff --git a/drivers/staging/android/sync_trace.h b/drivers/staging/android/sync_trace.h
> new file mode 100644
> index 0000000..ea485f7
> --- /dev/null
> +++ b/drivers/staging/android/sync_trace.h
> @@ -0,0 +1,32 @@
> +#undef TRACE_SYSTEM
> +#define TRACE_INCLUDE_PATH ../../drivers/staging/android
> +#define TRACE_SYSTEM sync_trace
> +
> +#if !defined(_TRACE_SYNC_H) || defined(TRACE_HEADER_MULTI_READ)
> +#define _TRACE_SYNC_H
> +
> +#include "sync_debug.h"
> +#include <linux/tracepoint.h>
> +
> +TRACE_EVENT(sync_timeline,
> + TP_PROTO(struct sync_timeline *timeline),
> +
> + TP_ARGS(timeline),
> +
> + TP_STRUCT__entry(
> + __string(name, timeline->name)
> + __field(u32, value)
> + ),
> +
> + TP_fast_assign(
> + __assign_str(name, timeline->name);
> + __entry->value = timeline->value;
> + ),
> +
> + TP_printk("name=%s value=%d", __get_str(name), __entry->value)
> +);
> +
> +#endif /* if !defined(_TRACE_SYNC_H) || defined(TRACE_HEADER_MULTI_READ) */
> +
> +/* This part must be outside protection */
> +#include <trace/define_trace.h>
> diff --git a/drivers/staging/android/trace/sync.h b/drivers/staging/android/trace/sync.h
> deleted file mode 100644
> index 6b5ce96..0000000
> --- a/drivers/staging/android/trace/sync.h
> +++ /dev/null
> @@ -1,32 +0,0 @@
> -#undef TRACE_SYSTEM
> -#define TRACE_INCLUDE_PATH ../../drivers/staging/android/trace
> -#define TRACE_SYSTEM sync
> -
> -#if !defined(_TRACE_SYNC_H) || defined(TRACE_HEADER_MULTI_READ)
> -#define _TRACE_SYNC_H
> -
> -#include "../sync_debug.h"
> -#include <linux/tracepoint.h>
> -
> -TRACE_EVENT(sync_timeline,
> - TP_PROTO(struct sync_timeline *timeline),
> -
> - TP_ARGS(timeline),
> -
> - TP_STRUCT__entry(
> - __string(name, timeline->name)
> - __field(u32, value)
> - ),
> -
> - TP_fast_assign(
> - __assign_str(name, timeline->name);
> - __entry->value = timeline->value;
> - ),
> -
> - TP_printk("name=%s value=%d", __get_str(name), __entry->value)
> -);
> -
> -#endif /* if !defined(_TRACE_SYNC_H) || defined(TRACE_HEADER_MULTI_READ) */
> -
> -/* This part must be outside protection */
> -#include <trace/define_trace.h>
> --
> 2.5.5
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
