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: Steven Rostedt (VMware) <rostedt@goodmis.org>
Signed-off-by: Bean Huo <beanhuo@micron.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Bean Huo 2021-01-05 12:34:41 +01:00 committed by Martin K. Petersen
parent a967ddb22d
commit c7c730ac6a

View File

@ -21,27 +21,27 @@
{ UNMAP, "UNMAP" }) { UNMAP, "UNMAP" })
#define UFS_LINK_STATES \ #define UFS_LINK_STATES \
EM(UIC_LINK_OFF_STATE) \ EM(UIC_LINK_OFF_STATE, "UIC_LINK_OFF_STATE") \
EM(UIC_LINK_ACTIVE_STATE) \ EM(UIC_LINK_ACTIVE_STATE, "UIC_LINK_ACTIVE_STATE") \
EMe(UIC_LINK_HIBERN8_STATE) EMe(UIC_LINK_HIBERN8_STATE, "UIC_LINK_HIBERN8_STATE")
#define UFS_PWR_MODES \ #define UFS_PWR_MODES \
EM(UFS_ACTIVE_PWR_MODE) \ EM(UFS_ACTIVE_PWR_MODE, "UFS_ACTIVE_PWR_MODE") \
EM(UFS_SLEEP_PWR_MODE) \ EM(UFS_SLEEP_PWR_MODE, "UFS_SLEEP_PWR_MODE") \
EM(UFS_POWERDOWN_PWR_MODE) \ EM(UFS_POWERDOWN_PWR_MODE, "UFS_POWERDOWN_PWR_MODE") \
EMe(UFS_DEEPSLEEP_PWR_MODE) EMe(UFS_DEEPSLEEP_PWR_MODE, "UFS_DEEPSLEEP_PWR_MODE")
#define UFSCHD_CLK_GATING_STATES \ #define UFSCHD_CLK_GATING_STATES \
EM(CLKS_OFF) \ EM(CLKS_OFF, "CLKS_OFF") \
EM(CLKS_ON) \ EM(CLKS_ON, "CLKS_ON") \
EM(REQ_CLKS_OFF) \ EM(REQ_CLKS_OFF, "REQ_CLKS_OFF") \
EMe(REQ_CLKS_ON) EMe(REQ_CLKS_ON, "REQ_CLKS_ON")
/* Enums require being exported to userspace, for user tool parsing */ /* Enums require being exported to userspace, for user tool parsing */
#undef EM #undef EM
#undef EMe #undef EMe
#define EM(a) TRACE_DEFINE_ENUM(a); #define EM(a, b) TRACE_DEFINE_ENUM(a);
#define EMe(a) TRACE_DEFINE_ENUM(a); #define EMe(a, b) TRACE_DEFINE_ENUM(a);
UFS_LINK_STATES; UFS_LINK_STATES;
UFS_PWR_MODES; UFS_PWR_MODES;
@ -53,8 +53,8 @@ UFSCHD_CLK_GATING_STATES;
*/ */
#undef EM #undef EM
#undef EMe #undef EMe
#define EM(a) { a, #a }, #define EM(a, b) {a, b},
#define EMe(a) { a, #a } #define EMe(a, b) {a, b}
TRACE_EVENT(ufshcd_clk_gating, TRACE_EVENT(ufshcd_clk_gating,