ASoC: Intel: Rename SST trace event header to be less generic.

The Intel audio DSP SST trace event header has been renamed from sst.h
to intel-sst.h in order to avoid any confusion with any future
Samoa Standard Time drivers ;)

Signed-off-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: Mark Brown <broonie@linaro.org>

diff --git a/include/trace/events/intel-sst.h b/include/trace/events/intel-sst.h
new file mode 100644 (file)
index 0000000..76c72d3
--- /dev/null
+++ b/include/trace/events/intel-sst.h
@@ -0,0 +1,148 @@
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM intel-sst
+
+#if !defined(_TRACE_INTEL_SST_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_INTEL_SST_H
+
+#include <linux/types.h>
+#include <linux/ktime.h>
+#include <linux/tracepoint.h>
+
+DECLARE_EVENT_CLASS(sst_ipc_msg,
+
+       TP_PROTO(unsigned int val),
+
+       TP_ARGS(val),
+
+       TP_STRUCT__entry(
+               __field(        unsigned int,   val             )
+       ),
+
+       TP_fast_assign(
+               __entry->val = val;
+       ),
+
+       TP_printk("0x%8.8x", (unsigned int)__entry->val)
+);
+
+DEFINE_EVENT(sst_ipc_msg, sst_ipc_msg_tx,
+
+       TP_PROTO(unsigned int val),
+
+       TP_ARGS(val)
+
+);
+
+DEFINE_EVENT(sst_ipc_msg, sst_ipc_msg_rx,
+
+       TP_PROTO(unsigned int val),
+
+       TP_ARGS(val)
+
+);
+
+DECLARE_EVENT_CLASS(sst_ipc_mailbox,
+
+       TP_PROTO(unsigned int offset, unsigned int val),
+
+       TP_ARGS(offset, val),
+
+       TP_STRUCT__entry(
+               __field(        unsigned int,   offset          )
+               __field(        unsigned int,   val             )
+       ),
+
+       TP_fast_assign(
+               __entry->offset = offset;
+               __entry->val = val;
+       ),
+
+       TP_printk(" 0x%4.4x = 0x%8.8x",
+               (unsigned int)__entry->offset, (unsigned int)__entry->val)
+);
+
+DEFINE_EVENT(sst_ipc_mailbox, sst_ipc_inbox_rdata,
+
+       TP_PROTO(unsigned int offset, unsigned int val),
+
+       TP_ARGS(offset, val)
+
+);
+
+DEFINE_EVENT(sst_ipc_mailbox, sst_ipc_inbox_wdata,
+
+       TP_PROTO(unsigned int offset, unsigned int val),
+
+       TP_ARGS(offset, val)
+
+);
+
+DEFINE_EVENT(sst_ipc_mailbox, sst_ipc_outbox_rdata,
+
+       TP_PROTO(unsigned int offset, unsigned int val),
+
+       TP_ARGS(offset, val)
+
+);
+
+DEFINE_EVENT(sst_ipc_mailbox, sst_ipc_outbox_wdata,
+
+       TP_PROTO(unsigned int offset, unsigned int val),
+
+       TP_ARGS(offset, val)
+
+);
+
+DECLARE_EVENT_CLASS(sst_ipc_mailbox_info,
+
+       TP_PROTO(unsigned int size),
+
+       TP_ARGS(size),
+
+       TP_STRUCT__entry(
+               __field(        unsigned int,   size            )
+       ),
+
+       TP_fast_assign(
+               __entry->size = size;
+       ),
+
+       TP_printk("Mailbox bytes 0x%8.8x", (unsigned int)__entry->size)
+);
+
+DEFINE_EVENT(sst_ipc_mailbox_info, sst_ipc_inbox_read,
+
+       TP_PROTO(unsigned int size),
+
+       TP_ARGS(size)
+
+);
+
+DEFINE_EVENT(sst_ipc_mailbox_info, sst_ipc_inbox_write,
+
+       TP_PROTO(unsigned int size),
+
+       TP_ARGS(size)
+
+);
+
+DEFINE_EVENT(sst_ipc_mailbox_info, sst_ipc_outbox_read,
+
+       TP_PROTO(unsigned int size),
+
+       TP_ARGS(size)
+
+);
+
+DEFINE_EVENT(sst_ipc_mailbox_info, sst_ipc_outbox_write,
+
+       TP_PROTO(unsigned int size),
+
+       TP_ARGS(size)
+
+);
+
+#endif /* _TRACE_SST_H */
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>

diff --git a/include/trace/events/sst.h b/include/trace/events/sst.h
deleted file mode 100644 (file)
index 1a0d6b3..0000000
--- a/include/trace/events/sst.h
+++ /dev/null
@@ -1,148 +0,0 @@
-#undef TRACE_SYSTEM
-#define TRACE_SYSTEM sst
-
-#if !defined(_TRACE_SST_H) || defined(TRACE_HEADER_MULTI_READ)
-#define _TRACE_SST_H
-
-#include <linux/types.h>
-#include <linux/ktime.h>
-#include <linux/tracepoint.h>
-
-DECLARE_EVENT_CLASS(sst_ipc_msg,
-
-       TP_PROTO(unsigned int val),
-
-       TP_ARGS(val),
-
-       TP_STRUCT__entry(
-               __field(        unsigned int,   val             )
-       ),
-
-       TP_fast_assign(
-               __entry->val = val;
-       ),
-
-       TP_printk("0x%8.8x", (unsigned int)__entry->val)
-);
-
-DEFINE_EVENT(sst_ipc_msg, sst_ipc_msg_tx,
-
-       TP_PROTO(unsigned int val),
-
-       TP_ARGS(val)
-
-);
-
-DEFINE_EVENT(sst_ipc_msg, sst_ipc_msg_rx,
-
-       TP_PROTO(unsigned int val),
-
-       TP_ARGS(val)
-
-);
-
-DECLARE_EVENT_CLASS(sst_ipc_mailbox,
-
-       TP_PROTO(unsigned int offset, unsigned int val),
-
-       TP_ARGS(offset, val),
-
-       TP_STRUCT__entry(
-               __field(        unsigned int,   offset          )
-               __field(        unsigned int,   val             )
-       ),
-
-       TP_fast_assign(
-               __entry->offset = offset;
-               __entry->val = val;
-       ),
-
-       TP_printk(" 0x%4.4x = 0x%8.8x",
-               (unsigned int)__entry->offset, (unsigned int)__entry->val)
-);
-
-DEFINE_EVENT(sst_ipc_mailbox, sst_ipc_inbox_rdata,
-
-       TP_PROTO(unsigned int offset, unsigned int val),
-
-       TP_ARGS(offset, val)
-
-);
-
-DEFINE_EVENT(sst_ipc_mailbox, sst_ipc_inbox_wdata,
-
-       TP_PROTO(unsigned int offset, unsigned int val),
-
-       TP_ARGS(offset, val)
-
-);
-
-DEFINE_EVENT(sst_ipc_mailbox, sst_ipc_outbox_rdata,
-
-       TP_PROTO(unsigned int offset, unsigned int val),
-
-       TP_ARGS(offset, val)
-
-);
-
-DEFINE_EVENT(sst_ipc_mailbox, sst_ipc_outbox_wdata,
-
-       TP_PROTO(unsigned int offset, unsigned int val),
-
-       TP_ARGS(offset, val)
-
-);
-
-DECLARE_EVENT_CLASS(sst_ipc_mailbox_info,
-
-       TP_PROTO(unsigned int size),
-
-       TP_ARGS(size),
-
-       TP_STRUCT__entry(
-               __field(        unsigned int,   size            )
-       ),
-
-       TP_fast_assign(
-               __entry->size = size;
-       ),
-
-       TP_printk("Mailbox bytes 0x%8.8x", (unsigned int)__entry->size)
-);
-
-DEFINE_EVENT(sst_ipc_mailbox_info, sst_ipc_inbox_read,
-
-       TP_PROTO(unsigned int size),
-
-       TP_ARGS(size)
-
-);
-
-DEFINE_EVENT(sst_ipc_mailbox_info, sst_ipc_inbox_write,
-
-       TP_PROTO(unsigned int size),
-
-       TP_ARGS(size)
-
-);
-
-DEFINE_EVENT(sst_ipc_mailbox_info, sst_ipc_outbox_read,
-
-       TP_PROTO(unsigned int size),
-
-       TP_ARGS(size)
-
-);
-
-DEFINE_EVENT(sst_ipc_mailbox_info, sst_ipc_outbox_write,
-
-       TP_PROTO(unsigned int size),
-
-       TP_ARGS(size)
-
-);
-
-#endif /* _TRACE_SST_H */
-
-/* This part must be outside protection */
-#include <trace/define_trace.h>

diff --git a/sound/soc/intel/sst-dsp.c b/sound/soc/intel/sst-dsp.c
index 1888de5..e0ad2e5 100644 (file)
--- a/sound/soc/intel/sst-dsp.c
+++ b/sound/soc/intel/sst-dsp.c
@@ -24,7 +24,7 @@
 #include "sst-dsp-priv.h"
 
 #define CREATE_TRACE_POINTS
-#include <trace/events/sst.h>
+#include <trace/events/intel-sst.h>
 
 /* Public API */
 void sst_dsp_shim_write(struct sst_dsp *sst, u32 offset, u32 value)