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>

diff --git a/include/trace/events/ufs.h b/include/trace/events/ufs.h
index 0bd54a1843913fe0abe18ada4730adbeb0cb94ea..fa755394bc0f481e0edf0496534d433ce9627b42 100644 (file)
--- a/include/trace/events/ufs.h
+++ b/include/trace/events/ufs.h
@@ -20,28 +20,28 @@
                { SYNCHRONIZE_CACHE,    "SYNC" },                       \
                { UNMAP,                "UNMAP" })
 
-#define UFS_LINK_STATES                        \
-       EM(UIC_LINK_OFF_STATE)          \
-       EM(UIC_LINK_ACTIVE_STATE)       \
-       EMe(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)
-
-#define UFSCHD_CLK_GATING_STATES       \
-       EM(CLKS_OFF)                    \
-       EM(CLKS_ON)                     \
-       EM(REQ_CLKS_OFF)                \
-       EMe(REQ_CLKS_ON)
+#define UFS_LINK_STATES                                                \
+       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,         "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,                    "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,