ALSA: hda - Reenable tracepoints for controller

After correcting the fields to point the right members, tracepoints
can be reenabled again for the legacy controller code.

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

diff --git a/sound/pci/hda/hda_controller.c b/sound/pci/hda/hda_controller.c
index 8f12ad9a4df5b6dd4c468b88cfd345b7a4a107e3..0e43f79e1d9b0766c3a50e880d63be127c868890 100644 (file)
--- a/sound/pci/hda/hda_controller.c
+++ b/sound/pci/hda/hda_controller.c
@@ -31,6 +31,9 @@
 #include <sound/initval.h>
 #include "hda_controller.h"
 
+#define CREATE_TRACE_POINTS
+#include "hda_intel_trace.h"
+
 /* DSP lock helpers */
 #define dsp_lock(dev)          snd_hdac_dsp_lock(azx_stream(dev))
 #define dsp_unlock(dev)                snd_hdac_dsp_unlock(azx_stream(dev))
@@ -229,6 +232,8 @@ static int azx_pcm_trigger(struct snd_pcm_substream *substream, int cmd)
        int sync_reg;
 
        azx_dev = get_azx_dev(substream);
+       trace_azx_pcm_trigger(chip, azx_dev, cmd);
+
        hstr = azx_stream(azx_dev);
        if (chip->driver_caps & AZX_DCAPS_OLD_SSYNC)
                sync_reg = AZX_REG_OLD_SSYNC;
@@ -330,6 +335,7 @@ unsigned int azx_get_position(struct azx *chip,
                substream->runtime->delay = delay;
        }
 
+       trace_azx_get_position(chip, azx_dev, pos, delay);
        return pos;
 }
 EXPORT_SYMBOL_GPL(azx_get_position);

diff --git a/sound/pci/hda/hda_intel_trace.h b/sound/pci/hda/hda_intel_trace.h
index 7b5e4c2cf9d594fcff2cb52e628821f9d05fc713..ae004737d0fde8bb6158b156a645bd3c03dadea8 100644 (file)
--- a/sound/pci/hda/hda_intel_trace.h
+++ b/sound/pci/hda/hda_intel_trace.h
@@ -24,7 +24,7 @@ TRACE_EVENT(azx_pcm_trigger,
 
        TP_fast_assign(
                __entry->card = (chip)->card->number;
-               __entry->idx = (dev)->index;
+               __entry->idx = (dev)->core.index;
                __entry->cmd = cmd;
        ),
 
@@ -46,7 +46,7 @@ TRACE_EVENT(azx_get_position,
 
        TP_fast_assign(
                __entry->card = (chip)->card->number;
-               __entry->idx = (dev)->index;
+               __entry->idx = (dev)->core.index;
                __entry->pos = pos;
                __entry->delay = delay;
        ),