diff options
| author |   Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2019-05-19 19:01:07 +0900 |
|---|---|---|
| committer |   Takashi Iwai <tiwai@suse.de> | 2019-05-21 07:46:43 +0200 |
| commit | a8520f3e9314edddf95479c4796f05b7d594be32 (patch) | |
| tree | 90e779367b1268d820162b975cddc59815ae1dc7 /sound/firewire/amdtp-stream-trace.h | |
| parent | ALSA: firewire-lib: add data_blocks/data_block_counter parameter to in_packet/out_packet tracing events (diff) | |
| download | wireguard-linux-a8520f3e9314edddf95479c4796f05b7d594be32.tar.xz wireguard-linux-a8520f3e9314edddf95479c4796f05b7d594be32.zip | |
ALSA: firewire-lib: use the same unit for payload argument in tracing events
The most of tracing event in this module have the size of payload in
byte unit, however 'in_packet_without_header' event have the argument
in quadlet unit.
This commit change the unit for argument to be consistent.
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire/amdtp-stream-trace.h')
| -rw-r--r-- | sound/firewire/amdtp-stream-trace.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/firewire/amdtp-stream-trace.h b/sound/firewire/amdtp-stream-trace.h index 95343fb17583..30c547552cd2 100644 --- a/sound/firewire/amdtp-stream-trace.h +++ b/sound/firewire/amdtp-stream-trace.h @@ -39,7 +39,7 @@ TRACE_EVENT(in_packet, __entry->dest = fw_parent_device(s->unit)->card->node_id; __entry->cip_header0 = be32_to_cpu(cip_header[0]); __entry->cip_header1 = be32_to_cpu(cip_header[1]); - __entry->payload_quadlets = payload_length / 4; + __entry->payload_quadlets = payload_length / sizeof(__be32); __entry->data_blocks = data_blocks; __entry->data_block_counter = s->data_block_counter, __entry->packet_index = s->packet_index; @@ -89,7 +89,7 @@ TRACE_EVENT(out_packet, __entry->dest = fw_parent_device(s->unit)->node_id; __entry->cip_header0 = be32_to_cpu(cip_header[0]); __entry->cip_header1 = be32_to_cpu(cip_header[1]); - __entry->payload_quadlets = payload_length / 4; + __entry->payload_quadlets = payload_length / sizeof(__be32); __entry->data_blocks = data_blocks; __entry->data_block_counter = s->data_block_counter, __entry->packet_index = s->packet_index; @@ -114,8 +114,8 @@ TRACE_EVENT(out_packet, ); TRACE_EVENT(in_packet_without_header, - TP_PROTO(const struct amdtp_stream *s, u32 cycles, unsigned int payload_quadlets, unsigned int data_blocks, unsigned int index), - TP_ARGS(s, cycles, payload_quadlets, data_blocks, index), + TP_PROTO(const struct amdtp_stream *s, u32 cycles, unsigned int payload_length, unsigned int data_blocks, unsigned int index), + TP_ARGS(s, cycles, payload_length, data_blocks, index), TP_STRUCT__entry( __field(unsigned int, second) __field(unsigned int, cycle) @@ -135,7 +135,7 @@ TRACE_EVENT(in_packet_without_header, __entry->channel = s->context->channel; __entry->src = fw_parent_device(s->unit)->node_id; __entry->dest = fw_parent_device(s->unit)->card->node_id; - __entry->payload_quadlets = payload_quadlets; + __entry->payload_quadlets = payload_length / sizeof(__be32); __entry->data_blocks = data_blocks, __entry->data_block_counter = s->data_block_counter, __entry->packet_index = s->packet_index; @@ -179,7 +179,7 @@ TRACE_EVENT(out_packet_without_header, __entry->channel = s->context->channel; __entry->src = fw_parent_device(s->unit)->card->node_id; __entry->dest = fw_parent_device(s->unit)->node_id; - __entry->payload_quadlets = payload_length / 4; + __entry->payload_quadlets = payload_length / sizeof(__be32); __entry->data_blocks = data_blocks, __entry->data_block_counter = s->data_block_counter, __entry->packet_index = s->packet_index; |