[PATCH] firmware: arm_scmi: replace resevered identifiers in macros

[trix at redhat.com]

From: Tom Rix <trix at redhat.com>

Identifiers starting with __ are resevered.  Replace __X with X.

The arguments to these macros are pointers.  The macros only reads
values.  There is no need to make copies of the pointers, use them
directly.

Fixes: a287126c31ab ("firmware: arm_scmi: Add configurable polling mode for transports")
Signed-off-by: Tom Rix <trix at redhat.com>
---
 drivers/firmware/arm_scmi/driver.c | 31 ++++++++----------------------
 1 file changed, 8 insertions(+), 23 deletions(-)

diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c
index b4bbfe89368df..d2fcfa9da931c 100644
--- a/drivers/firmware/arm_scmi/driver.c
+++ b/drivers/firmware/arm_scmi/driver.c
@@ -36,29 +36,14 @@
 #define CREATE_TRACE_POINTS
 #include <trace/events/scmi.h>
 
-#define IS_POLLING_REQUIRED(__c, __i)					\
-	((__c)->no_completion_irq || (__i)->desc->force_polling)	\
-
-#define IS_TRANSPORT_POLLING_CAPABLE(__i)				\
-({									\
-	bool __ret;							\
-	typeof(__i) i_ = __i;						\
-									\
-	__ret = ((i_)->desc->ops->poll_done ||				\
-			(i_)->desc->sync_cmds_completed_on_ret);	\
-	__ret;								\
-})
-
-#define IS_POLLING_ENABLED(__c, __i)					\
-({									\
-	bool __ret;							\
-	typeof(__c) c_ = __c;						\
-	typeof(__i) i_ = __i;						\
-									\
-	__ret = (IS_POLLING_REQUIRED(c_, i_) &&				\
-			IS_TRANSPORT_POLLING_CAPABLE(i_));		\
-	__ret;								\
-})
+#define IS_POLLING_REQUIRED(c, i)					\
+	((c)->no_completion_irq || (i)->desc->force_polling)
+
+#define IS_TRANSPORT_POLLING_CAPABLE(i)					\
+	((i)->desc->ops->poll_done || (i)->desc->sync_cmds_completed_on_ret)
+
+#define IS_POLLING_ENABLED(c, i)					\
+	(IS_POLLING_REQUIRED(c, i) && IS_TRANSPORT_POLLING_CAPABLE(i))
 
 enum scmi_error_codes {
 	SCMI_SUCCESS = 0,	/* Success */
-- 
2.26.3