Skip to content

Commit f1cba52

Browse files
committed
firewire: core: rename cause flag of tracepoints event
The flag of FW_ISO_CONTEXT_COMPLETIONS_CAUSE_IRQ directly causes hardIRQ request by 1394 OHCI hardware when the corresponding isochronous packet is transferred, however it is not so directly associated to hardIRQ processing itself. This commit renames the flag so that it relates to interrupt parameter of internal packet data. Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Takashi Sakamoto <[email protected]>
1 parent 4010cb1 commit f1cba52

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

drivers/firewire/ohci.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2927,7 +2927,7 @@ static int handle_ir_packet_per_buffer(struct context *context,
29272927
copy_iso_headers(ctx, (u32 *) (last + 1));
29282928

29292929
if (last->control & cpu_to_le16(DESCRIPTOR_IRQ_ALWAYS))
2930-
flush_iso_completions(ctx, FW_ISO_CONTEXT_COMPLETIONS_CAUSE_IRQ);
2930+
flush_iso_completions(ctx, FW_ISO_CONTEXT_COMPLETIONS_CAUSE_INTERRUPT);
29312931

29322932
return 1;
29332933
}
@@ -2963,7 +2963,7 @@ static int handle_ir_buffer_fill(struct context *context,
29632963

29642964
if (last->control & cpu_to_le16(DESCRIPTOR_IRQ_ALWAYS)) {
29652965
trace_isoc_inbound_multiple_completions(&ctx->base, completed,
2966-
FW_ISO_CONTEXT_COMPLETIONS_CAUSE_IRQ);
2966+
FW_ISO_CONTEXT_COMPLETIONS_CAUSE_INTERRUPT);
29672967

29682968
ctx->base.callback.mc(&ctx->base,
29692969
buffer_dma + completed,
@@ -3059,7 +3059,7 @@ static int handle_it_packet(struct context *context,
30593059
ctx->header_length += 4;
30603060

30613061
if (last->control & cpu_to_le16(DESCRIPTOR_IRQ_ALWAYS))
3062-
flush_iso_completions(ctx, FW_ISO_CONTEXT_COMPLETIONS_CAUSE_IRQ);
3062+
flush_iso_completions(ctx, FW_ISO_CONTEXT_COMPLETIONS_CAUSE_INTERRUPT);
30633063

30643064
return 1;
30653065
}

include/trace/events/firewire.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -830,13 +830,13 @@ TRACE_EVENT_CONDITION(isoc_inbound_multiple_queue,
830830
#ifndef show_cause
831831
enum fw_iso_context_completions_cause {
832832
FW_ISO_CONTEXT_COMPLETIONS_CAUSE_FLUSH = 0,
833-
FW_ISO_CONTEXT_COMPLETIONS_CAUSE_IRQ,
833+
FW_ISO_CONTEXT_COMPLETIONS_CAUSE_INTERRUPT,
834834
FW_ISO_CONTEXT_COMPLETIONS_CAUSE_HEADER_OVERFLOW,
835835
};
836836
#define show_cause(cause) \
837837
__print_symbolic(cause, \
838838
{ FW_ISO_CONTEXT_COMPLETIONS_CAUSE_FLUSH, "FLUSH" }, \
839-
{ FW_ISO_CONTEXT_COMPLETIONS_CAUSE_IRQ, "IRQ" }, \
839+
{ FW_ISO_CONTEXT_COMPLETIONS_CAUSE_INTERRUPT, "INTERRUPT" }, \
840840
{ FW_ISO_CONTEXT_COMPLETIONS_CAUSE_HEADER_OVERFLOW, "HEADER_OVERFLOW" } \
841841
)
842842
#endif

0 commit comments

Comments
 (0)