There are a few macros in IOMMU have single-char identifiers make the
code hard to read and debug. Replace them with meaningful names.

Suggested-by: Andrew Morton <a...@linux-foundation.org>
Signed-off-by: Qian Cai <c...@lca.pw>
---
 include/linux/dmar.h | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/include/linux/dmar.h b/include/linux/dmar.h
index f8af1d770520..eb634912f475 100644
--- a/include/linux/dmar.h
+++ b/include/linux/dmar.h
@@ -104,12 +104,14 @@ static inline bool dmar_rcu_check(void)
 
 #define        dmar_rcu_dereference(p) rcu_dereference_check((p), 
dmar_rcu_check())
 
-#define        for_each_dev_scope(a, c, p, d)  \
-       for ((p) = 0; ((d) = (p) < (c) ? dmar_rcu_dereference((a)[(p)].dev) : \
-                       NULL, (p) < (c)); (p)++)
-
-#define        for_each_active_dev_scope(a, c, p, d)   \
-       for_each_dev_scope((a), (c), (p), (d))  if (!(d)) { continue; } else
+#define for_each_dev_scope(devs, cnt, i, tmp)                          \
+       for ((i) = 0; ((tmp) = (i) < (cnt) ?                            \
+           dmar_rcu_dereference((devs)[(i)].dev) : NULL, (i) < (cnt)); \
+           (i)++)
+
+#define for_each_active_dev_scope(devs, cnt, i, tmp)                   \
+       for_each_dev_scope((devs), (cnt), (i), (tmp))                   \
+               if (!(tmp)) { continue; } else
 
 extern int dmar_table_init(void);
 extern int dmar_dev_scope_init(void);
-- 
1.8.3.1

Reply via email to