diff options
| author | Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2024-06-06 08:51:54 +0900 |
|---|---|---|
| committer | Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2024-06-17 08:37:03 +0900 |
| commit | 1ccfd1a4c809d99891142c1bb9851daa42e40f0d (patch) | |
| tree | 4b873341e98e708ba71b5a2e5ad4e697ef571b26 | |
| parent | f9a228364e5e2e80ea964214806d7b65b8ec93fb (diff) | |
| download | linux-stable-1ccfd1a4c809d99891142c1bb9851daa42e40f0d.tar.gz linux-stable-1ccfd1a4c809d99891142c1bb9851daa42e40f0d.tar.bz2 linux-stable-1ccfd1a4c809d99891142c1bb9851daa42e40f0d.zip | |
firewire: core: arrangement header inclusion for tracepoints events
It is a bit inconvenient to put the relative path to local header from
tree-wide header.
This commit delegates the selection to include headers into users.
Link: https://lore.kernel.org/r/20240605235155.116468-11-o-takashi@sakamocchi.jp
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
| -rw-r--r-- | drivers/firewire/core-trace.c | 3 | ||||
| -rw-r--r-- | drivers/firewire/core-transaction.c | 2 | ||||
| -rw-r--r-- | drivers/firewire/packet-header-definitions.h | 2 | ||||
| -rw-r--r-- | include/trace/events/firewire.h | 2 |
4 files changed, 7 insertions, 2 deletions
diff --git a/drivers/firewire/core-trace.c b/drivers/firewire/core-trace.c index 96cbd9d384dc..7cbf850f3719 100644 --- a/drivers/firewire/core-trace.c +++ b/drivers/firewire/core-trace.c @@ -1,5 +1,8 @@ // SPDX-License-Identifier: GPL-2.0-or-later // Copyright (c) 2024 Takashi Sakamoto +#include <linux/types.h> +#include "packet-header-definitions.h" + #define CREATE_TRACE_POINTS #include <trace/events/firewire.h> diff --git a/drivers/firewire/core-transaction.c b/drivers/firewire/core-transaction.c index 76ab6a209768..8410e7b4ab60 100644 --- a/drivers/firewire/core-transaction.c +++ b/drivers/firewire/core-transaction.c @@ -29,8 +29,8 @@ #include <asm/byteorder.h> #include "core.h" -#include <trace/events/firewire.h> #include "packet-header-definitions.h" +#include <trace/events/firewire.h> #define HEADER_DESTINATION_IS_BROADCAST(header) \ ((async_header_get_destination(header) & 0x3f) == 0x3f) diff --git a/drivers/firewire/packet-header-definitions.h b/drivers/firewire/packet-header-definitions.h index ab9d0fa790d4..87a5a31845c3 100644 --- a/drivers/firewire/packet-header-definitions.h +++ b/drivers/firewire/packet-header-definitions.h @@ -7,6 +7,8 @@ #ifndef _FIREWIRE_PACKET_HEADER_DEFINITIONS_H #define _FIREWIRE_PACKET_HEADER_DEFINITIONS_H +#include <linux/types.h> + #define ASYNC_HEADER_QUADLET_COUNT 4 #define ASYNC_HEADER_Q0_DESTINATION_SHIFT 16 diff --git a/include/trace/events/firewire.h b/include/trace/events/firewire.h index 5ccc0d91b220..1a18533778f1 100644 --- a/include/trace/events/firewire.h +++ b/include/trace/events/firewire.h @@ -11,7 +11,7 @@ #include <linux/firewire-constants.h> -#include "../../../drivers/firewire/packet-header-definitions.h" +// Some macros are defined in 'drivers/firewire/packet-header-definitions.h'. // The content of TP_printk field is preprocessed, then put to the module binary. #define ASYNC_HEADER_GET_DESTINATION(header) \ |