summaryrefslogtreecommitdiffstats
path: root/include/trace/events/firewire.h
diff options
context:
space:
mode:
authorTakashi Sakamoto <o-takashi@sakamocchi.jp>2024-07-12 02:30:10 +0200
committerTakashi Sakamoto <o-takashi@sakamocchi.jp>2024-07-12 07:34:12 +0200
commit06dcc4c9baa9e92896f00d02ffa760c0988b4371 (patch)
tree414ef66c510184cee5726a927a640b938d6b5be7 /include/trace/events/firewire.h
parentRevert "firewire: ohci: use common macro to interpret be32 data in le32 buffer" (diff)
downloadlinux-06dcc4c9baa9e92896f00d02ffa760c0988b4371.tar.xz
linux-06dcc4c9baa9e92896f00d02ffa760c0988b4371.zip
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>
Diffstat (limited to 'include/trace/events/firewire.h')
-rw-r--r--include/trace/events/firewire.h15
1 files changed, 10 insertions, 5 deletions
diff --git a/include/trace/events/firewire.h b/include/trace/events/firewire.h
index bac9d98e88e5..b108176deb22 100644
--- a/include/trace/events/firewire.h
+++ b/include/trace/events/firewire.h
@@ -392,9 +392,6 @@ TRACE_EVENT(bus_reset_handle,
#define PHY_PACKET_SELF_ID_GET_INITIATED_RESET(quads) \
((((const u32 *)quads)[0] & SELF_ID_ZERO_INITIATED_RESET_MASK) >> SELF_ID_ZERO_INITIATED_RESET_SHIFT)
-void copy_port_status(u8 *port_status, unsigned int port_capacity, const u32 *self_id_sequence,
- unsigned int quadlet_count);
-
TRACE_EVENT(self_id_sequence,
TP_PROTO(unsigned int card_index, const u32 *self_id_sequence, unsigned int quadlet_count, unsigned int generation),
TP_ARGS(card_index, self_id_sequence, quadlet_count, generation),
@@ -407,8 +404,16 @@ TRACE_EVENT(self_id_sequence,
TP_fast_assign(
__entry->card_index = card_index;
__entry->generation = generation;
- copy_port_status(__get_dynamic_array(port_status), __get_dynamic_array_len(port_status),
- self_id_sequence, quadlet_count);
+ {
+ u8 *port_status = __get_dynamic_array(port_status);
+ unsigned int port_index;
+
+ for (port_index = 0; port_index < __get_dynamic_array_len(port_status); ++port_index) {
+ port_status[port_index] =
+ self_id_sequence_get_port_status(self_id_sequence,
+ quadlet_count, port_index);
+ }
+ }
memcpy(__get_dynamic_array(self_id_sequence), self_id_sequence,
__get_dynamic_array_len(self_id_sequence));
),