Skip to content

Commit 89835a5

Browse files
avri-altman-sndkmartinkpetersen
authored andcommitted
scsi: ufs: Move UFS trace events to private header
UFS trace events are called exclusively from the UFS core drivers. Make those events private to the core driver. The MAINTAINERS file does not need updating as the maintainership remains the same and the relevant directory is already covered. Reviewed-by: Bart Van Assche <[email protected]> Signed-off-by: Avri Altman <[email protected]> Link: https://lore.kernel.org/r/[email protected] Acked-by: Bean Huo <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
1 parent 3ba9635 commit 89835a5

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

include/trace/events/ufs.h renamed to drivers/ufs/core/ufs_trace.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#if !defined(_TRACE_UFS_H) || defined(TRACE_HEADER_MULTI_READ)
1010
#define _TRACE_UFS_H
1111

12+
#include <ufs/ufs.h>
1213
#include <linux/tracepoint.h>
1314

1415
#define str_opcode(opcode) \
@@ -395,5 +396,10 @@ TRACE_EVENT(ufshcd_exception_event,
395396

396397
#endif /* if !defined(_TRACE_UFS_H) || defined(TRACE_HEADER_MULTI_READ) */
397398

399+
#undef TRACE_INCLUDE_PATH
400+
#define TRACE_INCLUDE_PATH ../../drivers/ufs/core
401+
#undef TRACE_INCLUDE_FILE
402+
#define TRACE_INCLUDE_FILE ufs_trace
403+
398404
/* This part must be outside protection */
399405
#include <trace/define_trace.h>

drivers/ufs/core/ufshcd.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
#include <asm/unaligned.h>
4040

4141
#define CREATE_TRACE_POINTS
42-
#include <trace/events/ufs.h>
42+
#include "ufs_trace.h"
4343

4444
#define UFSHCD_ENABLE_INTRS (UTP_TRANSFER_REQ_COMPL |\
4545
UTP_TASK_REQ_COMPL |\

include/ufs/ufs.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -597,7 +597,7 @@ struct ufs_dev_info {
597597
};
598598

599599
/*
600-
* This enum is used in string mapping in include/trace/events/ufs.h.
600+
* This enum is used in string mapping in ufs_trace.h.
601601
*/
602602
enum ufs_trace_str_t {
603603
UFS_CMD_SEND, UFS_CMD_COMP, UFS_DEV_COMP,
@@ -607,7 +607,7 @@ enum ufs_trace_str_t {
607607

608608
/*
609609
* Transaction Specific Fields (TSF) type in the UPIU package, this enum is
610-
* used in include/trace/events/ufs.h for UFS command trace.
610+
* used in ufs_trace.h for UFS command trace.
611611
*/
612612
enum ufs_trace_tsf_t {
613613
UFS_TSF_CDB, UFS_TSF_OSF, UFS_TSF_TM_INPUT, UFS_TSF_TM_OUTPUT

0 commit comments

Comments
 (0)