[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20240712000424.85124-1-o-takashi@sakamocchi.jp>
Date: Fri, 12 Jul 2024 09:04:24 +0900
From: Takashi Sakamoto <o-takashi@...amocchi.jp>
To: linux1394-devel@...ts.sourceforge.net
Cc: linux-kernel@...r.kernel.org
Subject: [PATCH] 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.
Signed-off-by: Takashi Sakamoto <o-takashi@...amocchi.jp>
---
drivers/firewire/core-trace.c | 11 -----------
include/trace/events/firewire.h | 12 ++++++++++--
2 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/drivers/firewire/core-trace.c b/drivers/firewire/core-trace.c
index 5acb02c18a47..b70947fc7b8d 100644
--- a/drivers/firewire/core-trace.c
+++ b/drivers/firewire/core-trace.c
@@ -10,17 +10,6 @@
#include <trace/events/firewire.h>
#ifdef TRACEPOINTS_ENABLED
-void copy_port_status(u8 *port_status, unsigned int port_capacity,
- const u32 *self_id_sequence, unsigned int quadlet_count)
-{
- unsigned int port_index;
-
- for (port_index = 0; port_index < port_capacity; ++port_index) {
- port_status[port_index] =
- self_id_sequence_get_port_status(self_id_sequence, quadlet_count, port_index);
- }
-}
-
EXPORT_TRACEPOINT_SYMBOL_GPL(isoc_inbound_single_completions);
EXPORT_TRACEPOINT_SYMBOL_GPL(isoc_inbound_multiple_completions);
EXPORT_TRACEPOINT_SYMBOL_GPL(isoc_outbound_completions);
diff --git a/include/trace/events/firewire.h b/include/trace/events/firewire.h
index bac9d98e88e5..57a2be01d31a 100644
--- a/include/trace/events/firewire.h
+++ b/include/trace/events/firewire.h
@@ -407,8 +407,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));
),
--
2.43.0
Powered by blists - more mailing lists