ALSA: hda - Re-add tracepoints to HD-audio core driver

Now let's take the basic tracepoints back to the HD-audio driver.
The three bus tracepoints, hda_send_cmd, hda_get_response and
hda_unsol_event are revived but in a slightly different form.
Since we don't assign the card number there, print the bus device name
instead.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

2 files changed, 0 insertions, 120 deletions

diff --git a/sound/pci/hda/Makefile b/sound/pci/hda/Makefile
index 96caaebfc19d..af78fb33a4fd 100644
--- a/sound/pci/hda/Makefile
+++ b/sound/pci/hda/Makefile
@@ -10,7 +10,6 @@ snd-hda-codec-$(CONFIG_SND_HDA_HWDEP) += hda_hwdep.o
 snd-hda-codec-$(CONFIG_SND_HDA_INPUT_BEEP) += hda_beep.o
 
 # for trace-points
-CFLAGS_hda_codec.o := -I$(src)
 CFLAGS_hda_controller.o := -I$(src)
 
 snd-hda-codec-generic-objs :=   hda_generic.o
diff --git a/sound/pci/hda/hda_trace.h b/sound/pci/hda/hda_trace.h
deleted file mode 100644
index 7fedfa862419..000000000000
--- a/sound/pci/hda/hda_trace.h
+++ /dev/null
@@ -1,119 +0,0 @@
-#undef TRACE_SYSTEM
-#define TRACE_SYSTEM hda
-#define TRACE_INCLUDE_FILE hda_trace
-
-#if !defined(_TRACE_HDA_H) || defined(TRACE_HEADER_MULTI_READ)
-#define _TRACE_HDA_H
-
-#include <linux/tracepoint.h>
-
-struct hda_bus;
-struct hda_codec;
-
-DECLARE_EVENT_CLASS(hda_cmd,
-
-        TP_PROTO(struct hda_codec *codec, unsigned int val),
-
-        TP_ARGS(codec, val),
-
-        TP_STRUCT__entry(
-                __field( unsigned int, card )
-                __field( unsigned int, addr )
-                __field( unsigned int, val )
-        ),
-
-        TP_fast_assign(
-                __entry->card = (codec)->card->number;
-                __entry->addr = (codec)->addr;
-                __entry->val = (val);
-        ),
-
-        TP_printk("[%d:%d] val=%x", __entry->card, __entry->addr, __entry->val)
-);
-
-DEFINE_EVENT(hda_cmd, hda_send_cmd,
-        TP_PROTO(struct hda_codec *codec, unsigned int val),
-        TP_ARGS(codec, val)
-);
-
-DEFINE_EVENT(hda_cmd, hda_get_response,
-        TP_PROTO(struct hda_codec *codec, unsigned int val),
-        TP_ARGS(codec, val)
-);
-
-TRACE_EVENT(hda_bus_reset,
-
-        TP_PROTO(struct hda_bus *bus),
-
-        TP_ARGS(bus),
-
-        TP_STRUCT__entry(
-                __field( unsigned int, card )
-        ),
-
-        TP_fast_assign(
-                __entry->card = (bus)->card->number;
-        ),
-
-        TP_printk("[%d]", __entry->card)
-);
-
-#ifdef CONFIG_PM
-DECLARE_EVENT_CLASS(hda_power,
-
-        TP_PROTO(struct hda_codec *codec),
-
-        TP_ARGS(codec),
-
-        TP_STRUCT__entry(
-                __field( unsigned int, card )
-                __field( unsigned int, addr )
-        ),
-
-        TP_fast_assign(
-                __entry->card = (codec)->card->number;
-                __entry->addr = (codec)->addr;
-        ),
-
-        TP_printk("[%d:%d]", __entry->card, __entry->addr)
-);
-
-DEFINE_EVENT(hda_power, hda_power_down,
-        TP_PROTO(struct hda_codec *codec),
-        TP_ARGS(codec)
-);
-
-DEFINE_EVENT(hda_power, hda_power_up,
-        TP_PROTO(struct hda_codec *codec),
-        TP_ARGS(codec)
-);
-#endif /* CONFIG_PM */
-
-TRACE_EVENT(hda_unsol_event,
-
-        TP_PROTO(struct hda_bus *bus, u32 res, u32 res_ex),
-
-        TP_ARGS(bus, res, res_ex),
-
-        TP_STRUCT__entry(
-                __field( unsigned int, card )
-                __field( u32, res )
-                __field( u32, res_ex )
-        ),
-
-        TP_fast_assign(
-                __entry->card = (bus)->card->number;
-                __entry->res = res;
-                __entry->res_ex = res_ex;
-        ),
-
-        TP_printk("[%d] res=%x, res_ex=%x", __entry->card,
-                  __entry->res, __entry->res_ex)
-);
-
-#endif /* _TRACE_HDA_H */
-
-/* This part must be outside protection */
-#undef TRACE_INCLUDE_PATH
-#define TRACE_INCLUDE_PATH .
-#include <trace/define_trace.h>