Skip to content

Commit 06dcc4c

Browse files
committed
firewire: core: move copy_port_status() helper function to TP_fast_assign() block
It would be possible to put any statement in TP_fast_assign(). This commit obsoletes the helper function and put its statements to TP_fast_assign() for the code simplicity. Link: https://lore.kernel.org/r/20240712003010.87341-1-o-takashi@sakamocchi.jp Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
1 parent 9f349e8 commit 06dcc4c

File tree

2 files changed

+10
-16
lines changed

2 files changed

+10
-16
lines changed

drivers/firewire/core-trace.c

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,6 @@
1010
#include <trace/events/firewire.h>
1111

1212
#ifdef TRACEPOINTS_ENABLED
13-
void copy_port_status(u8 *port_status, unsigned int port_capacity,
14-
const u32 *self_id_sequence, unsigned int quadlet_count)
15-
{
16-
unsigned int port_index;
17-
18-
for (port_index = 0; port_index < port_capacity; ++port_index) {
19-
port_status[port_index] =
20-
self_id_sequence_get_port_status(self_id_sequence, quadlet_count, port_index);
21-
}
22-
}
23-
2413
EXPORT_TRACEPOINT_SYMBOL_GPL(isoc_inbound_single_completions);
2514
EXPORT_TRACEPOINT_SYMBOL_GPL(isoc_inbound_multiple_completions);
2615
EXPORT_TRACEPOINT_SYMBOL_GPL(isoc_outbound_completions);

include/trace/events/firewire.h

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -392,9 +392,6 @@ TRACE_EVENT(bus_reset_handle,
392392
#define PHY_PACKET_SELF_ID_GET_INITIATED_RESET(quads) \
393393
((((const u32 *)quads)[0] & SELF_ID_ZERO_INITIATED_RESET_MASK) >> SELF_ID_ZERO_INITIATED_RESET_SHIFT)
394394

395-
void copy_port_status(u8 *port_status, unsigned int port_capacity, const u32 *self_id_sequence,
396-
unsigned int quadlet_count);
397-
398395
TRACE_EVENT(self_id_sequence,
399396
TP_PROTO(unsigned int card_index, const u32 *self_id_sequence, unsigned int quadlet_count, unsigned int generation),
400397
TP_ARGS(card_index, self_id_sequence, quadlet_count, generation),
@@ -407,8 +404,16 @@ TRACE_EVENT(self_id_sequence,
407404
TP_fast_assign(
408405
__entry->card_index = card_index;
409406
__entry->generation = generation;
410-
copy_port_status(__get_dynamic_array(port_status), __get_dynamic_array_len(port_status),
411-
self_id_sequence, quadlet_count);
407+
{
408+
u8 *port_status = __get_dynamic_array(port_status);
409+
unsigned int port_index;
410+
411+
for (port_index = 0; port_index < __get_dynamic_array_len(port_status); ++port_index) {
412+
port_status[port_index] =
413+
self_id_sequence_get_port_status(self_id_sequence,
414+
quadlet_count, port_index);
415+
}
416+
}
412417
memcpy(__get_dynamic_array(self_id_sequence), self_id_sequence,
413418
__get_dynamic_array_len(self_id_sequence));
414419
),

0 commit comments

Comments
 (0)