ALSA: firewire-lib: pass data block count as an argument to tracepoints event

This is a preparation for future commit that 'struct
amdtp_stream.data_block_count' does not represent the value of
data block count for current data block.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/firewire/amdtp-stream-trace.h b/sound/firewire/amdtp-stream-trace.h
index 4adbbf789cbe80c1fd2040e9685d79dde806f154..16c7f6605511ee848ec78e6f719926cf66d945b3 100644 (file)
--- a/sound/firewire/amdtp-stream-trace.h
+++ b/sound/firewire/amdtp-stream-trace.h
@@ -14,8 +14,8 @@
 #include <linux/tracepoint.h>
 
 TRACE_EVENT(amdtp_packet,
-       TP_PROTO(const struct amdtp_stream *s, u32 cycles, const __be32 *cip_header, unsigned int payload_length, unsigned int data_blocks, unsigned int index),
-       TP_ARGS(s, cycles, cip_header, payload_length, data_blocks, index),
+       TP_PROTO(const struct amdtp_stream *s, u32 cycles, const __be32 *cip_header, unsigned int payload_length, unsigned int data_blocks, unsigned int data_block_counter, unsigned int index),
+       TP_ARGS(s, cycles, cip_header, payload_length, data_blocks, data_block_counter, index),
        TP_STRUCT__entry(
                __field(unsigned int, second)
                __field(unsigned int, cycle)
@@ -47,7 +47,7 @@ TRACE_EVENT(amdtp_packet,
                }
                __entry->payload_quadlets = payload_length / sizeof(__be32);
                __entry->data_blocks = data_blocks;
-               __entry->data_block_counter = s->data_block_counter,
+               __entry->data_block_counter = data_block_counter,
                __entry->packet_index = s->packet_index;
                __entry->irq = !!in_interrupt();
                __entry->index = index;

diff --git a/sound/firewire/amdtp-stream.c b/sound/firewire/amdtp-stream.c
index fc1e8e5b9429e1003d6ce5511b85dd10d6055bdf..fe1512905a43bc96bafb5f05c0bdd1f8d0f44716 100644 (file)
--- a/sound/firewire/amdtp-stream.c
+++ b/sound/firewire/amdtp-stream.c
@@ -511,7 +511,7 @@ static void build_it_pkt_header(struct amdtp_stream *s, unsigned int cycle,
        }
 
        trace_amdtp_packet(s, cycle, cip_header, payload_length, data_blocks,
-                          index);
+                          s->data_block_counter, index);
 
        if (!(s->flags & CIP_DBC_IS_END_EVENT)) {
                s->data_block_counter =
@@ -653,7 +653,7 @@ static int parse_ir_ctx_header(struct amdtp_stream *s, unsigned int cycle,
        s->data_block_counter = dbc;
 
        trace_amdtp_packet(s, cycle, cip_header, *payload_length, *data_blocks,
-                          index);
+                          s->data_block_counter, index);
 
        return err;
 }