diff options
| author | Takashi Sakamoto | 2019-05-19 12:01:09 +0200 |
|---|---|---|
| committer | Takashi Iwai | 2019-05-21 07:46:56 +0200 |
| commit | 8d3f1fdf521165cac96a21e35f5a1630147d91b1 (patch) | |
| tree | 2382260974803d05b333959594b9d705ec109f66 /sound/firewire/amdtp-stream.c | |
| parent | ALSA: firewire-lib: use dynamic array for CIP header of tracing events (diff) | |
| download | kernel-qcow2-linux-8d3f1fdf521165cac96a21e35f5a1630147d91b1.tar.gz kernel-qcow2-linux-8d3f1fdf521165cac96a21e35f5a1630147d91b1.tar.xz kernel-qcow2-linux-8d3f1fdf521165cac96a21e35f5a1630147d91b1.zip | |
ALSA: firewire-lib: unify tracing events to 'amdtp_packet' event
Now four events of this module have the same arguments and probe timing.
This commit adds a new event, 'amdtp_packet', and replace them. Filtering
functionality of tracing framework is available to pick up events for
inbound/outbound isochronous packets.
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire/amdtp-stream.c')
| -rw-r--r-- | sound/firewire/amdtp-stream.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/sound/firewire/amdtp-stream.c b/sound/firewire/amdtp-stream.c index 15ae1f2989e5..6b3f936fab91 100644 --- a/sound/firewire/amdtp-stream.c +++ b/sound/firewire/amdtp-stream.c @@ -493,7 +493,7 @@ static int handle_out_packet(struct amdtp_stream *s, (s->data_block_counter + data_blocks) & 0xff; payload_length = 8 + data_blocks * 4 * s->data_block_quadlets; - trace_out_packet(s, cycle, buffer, payload_length, data_blocks, index); + trace_amdtp_packet(s, cycle, buffer, payload_length, data_blocks, index); if (queue_out_packet(s, payload_length) < 0) return -EIO; @@ -524,8 +524,7 @@ static int handle_out_packet_without_header(struct amdtp_stream *s, payload_length = data_blocks * 4 * s->data_block_quadlets; - trace_out_packet_without_header(s, cycle, payload_length, data_blocks, - index); + trace_amdtp_packet(s, cycle, NULL, payload_length, data_blocks, index); if (queue_out_packet(s, payload_length) < 0) return -EIO; @@ -633,7 +632,7 @@ static int handle_in_packet(struct amdtp_stream *s, return -EIO; } - trace_in_packet(s, cycle, buffer, payload_length, data_blocks, index); + trace_amdtp_packet(s, cycle, buffer, payload_length, data_blocks, index); syt = be32_to_cpu(buffer[1]) & CIP_SYT_MASK; pcm_frames = s->process_data_blocks(s, buffer + 2, data_blocks, &syt); @@ -666,8 +665,7 @@ static int handle_in_packet_without_header(struct amdtp_stream *s, buffer = s->buffer.packets[s->packet_index].buffer; data_blocks = payload_length / sizeof(__be32) / s->data_block_quadlets; - trace_in_packet_without_header(s, cycle, payload_length, data_blocks, - index); + trace_amdtp_packet(s, cycle, NULL, payload_length, data_blocks, index); pcm_frames = s->process_data_blocks(s, buffer, data_blocks, NULL); s->data_block_counter = (s->data_block_counter + data_blocks) & 0xff; |