p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ALSA: firewire-lib: use the same type of argument for CIP header for tracing event 

An argument for CIP header in 'in_packet' event is not the same type in
'out_packet' event. This is not good to unify these events.

This commit uses the same type of argument for these events.

Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Sakamoto 2019-05-19 19:01:05 +09:00 committed by Takashi Iwai
parent c4580f2097
commit 4a10cecc41
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sound/firewire/amdtp-stream-trace.h
View File

@ -14,7 +14,7 @@
#include <linux/tracepoint.h> #include <linux/tracepoint.h>
TRACE_EVENT(in_packet, TRACE_EVENT(in_packet,
TP_PROTO(const struct amdtp_stream *s, u32 cycles, u32 *cip_header, unsigned int payload_length, unsigned int index), TP_PROTO(const struct amdtp_stream *s, u32 cycles, const __be32 *cip_header, unsigned int payload_length, unsigned int index),
TP_ARGS(s, cycles, cip_header, payload_length, index), TP_ARGS(s, cycles, cip_header, payload_length, index),
TP_STRUCT__entry( TP_STRUCT__entry(
__field(unsigned int, second) __field(unsigned int, second)
@ -35,8 +35,8 @@ TRACE_EVENT(in_packet,
__entry->channel = s->context->channel; __entry->channel = s->context->channel;
__entry->src = fw_parent_device(s->unit)->node_id; __entry->src = fw_parent_device(s->unit)->node_id;
__entry->dest = fw_parent_device(s->unit)->card->node_id; __entry->dest = fw_parent_device(s->unit)->card->node_id;
__entry->cip_header0 = cip_header[0]; __entry->cip_header0 = be32_to_cpu(cip_header[0]);
__entry->cip_header1 = cip_header[1]; __entry->cip_header1 = be32_to_cpu(cip_header[1]);
__entry->payload_quadlets = payload_length / 4; __entry->payload_quadlets = payload_length / 4;
__entry->packet_index = s->packet_index; __entry->packet_index = s->packet_index;
__entry->irq = !!in_interrupt(); __entry->irq = !!in_interrupt();

2
sound/firewire/amdtp-stream.c
View File

@ -555,7 +555,7 @@ static int handle_in_packet(struct amdtp_stream *s,
cip_header[0] = be32_to_cpu(buffer[0]); cip_header[0] = be32_to_cpu(buffer[0]);
cip_header[1] = be32_to_cpu(buffer[1]); cip_header[1] = be32_to_cpu(buffer[1]);
trace_in_packet(s, cycle, cip_header, payload_length, index); trace_in_packet(s, cycle, buffer, payload_length, index);
/* /*
* This module supports 'Two-quadlet CIP header with SYT field'. * This module supports 'Two-quadlet CIP header with SYT field'.