Commit c7c730ac authored by Bean Huo's avatar Bean Huo Committed by Martin K. Petersen
Browse files

scsi: ufs: Remove stringize operator '#' restriction 

Current EM macro definition, we use stringize operator '#', which turns the
argument it precedes into a quoted string. Thus requires the symbol of
__print_symbolic() should be the string corresponding to the name of the
enum.

However, we have other cases, the symbol and enum name are not the same, we
can redefine EM/EMe, but there will introduce some redundant codes.  This
patch is to remove this restriction, let others reuse the current EM/EMe
definition.

Link: https://lore.kernel.org/r/20210105113446.16027-2-huobean@gmail.com


Acked-by: default avatarSteven Rostedt (VMware) <rostedt@goodmis.org>
Signed-off-by: default avatarBean Huo <beanhuo@micron.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent a967ddb2

include/trace/events/ufs.h

+20 −20
Original line number Diff line number Diff line
@@ -21,27 +21,27 @@ 
		{ UNMAP,		"UNMAP" })



#define UFS_LINK_STATES						\

	EM(UIC_LINK_OFF_STATE)		\

	EM(UIC_LINK_ACTIVE_STATE)	\

	EMe(UIC_LINK_HIBERN8_STATE)

	EM(UIC_LINK_OFF_STATE,		"UIC_LINK_OFF_STATE")		\

	EM(UIC_LINK_ACTIVE_STATE,	"UIC_LINK_ACTIVE_STATE")	\

	EMe(UIC_LINK_HIBERN8_STATE,	"UIC_LINK_HIBERN8_STATE")



#define UFS_PWR_MODES							\

	EM(UFS_ACTIVE_PWR_MODE)		\

	EM(UFS_SLEEP_PWR_MODE)		\

	EM(UFS_POWERDOWN_PWR_MODE)	\

	EMe(UFS_DEEPSLEEP_PWR_MODE)

	EM(UFS_ACTIVE_PWR_MODE,		"UFS_ACTIVE_PWR_MODE")		\

	EM(UFS_SLEEP_PWR_MODE,		"UFS_SLEEP_PWR_MODE")		\

	EM(UFS_POWERDOWN_PWR_MODE,	"UFS_POWERDOWN_PWR_MODE")	\

	EMe(UFS_DEEPSLEEP_PWR_MODE,	"UFS_DEEPSLEEP_PWR_MODE")



#define UFSCHD_CLK_GATING_STATES				\

	EM(CLKS_OFF)			\

	EM(CLKS_ON)			\

	EM(REQ_CLKS_OFF)		\

	EMe(REQ_CLKS_ON)

	EM(CLKS_OFF,			"CLKS_OFF")		\

	EM(CLKS_ON,			"CLKS_ON")		\

	EM(REQ_CLKS_OFF,		"REQ_CLKS_OFF")		\

	EMe(REQ_CLKS_ON,		"REQ_CLKS_ON")



/* Enums require being exported to userspace, for user tool parsing */

#undef EM

#undef EMe

#define EM(a)	TRACE_DEFINE_ENUM(a);

#define EMe(a)	TRACE_DEFINE_ENUM(a);

#define EM(a, b)	TRACE_DEFINE_ENUM(a);

#define EMe(a, b)	TRACE_DEFINE_ENUM(a);



UFS_LINK_STATES;

UFS_PWR_MODES;
@@ -53,8 +53,8 @@ UFSCHD_CLK_GATING_STATES; 
 */

#undef EM

#undef EMe

#define EM(a)	{ a, #a },

#define EMe(a)	{ a, #a }

#define EM(a, b)	{a, b},

#define EMe(a, b)	{a, b}



TRACE_EVENT(ufshcd_clk_gating,