From: "Edgar E. Iglesias" <edgar.igles...@xilinx.com>
Add __DT_MATCH macros without braces to allow the creation
of match descriptors with multiple combined match options.
Acked-by: Julien Grall <julien.gr...@arm.com>
Signed-off-by: Edgar E. Iglesias <edgar.igles...@xilinx.com>
---
xen/include/xen/device_tree.h | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/xen/include/xen/device_tree.h b/xen/include/xen/device_tree.h
index 3657ac2..da153a5 100644
--- a/xen/include/xen/device_tree.h
+++ b/xen/include/xen/device_tree.h
@@ -32,10 +32,15 @@ struct dt_device_match {
const void *data;
};
-#define DT_MATCH_PATH(p) { .path = p }
-#define DT_MATCH_TYPE(typ) { .type = typ }
-#define DT_MATCH_COMPATIBLE(compat) { .compatible = compat }
-#define DT_MATCH_NOT_AVAILABLE() { .not_available = 1 }
+#define __DT_MATCH_PATH(p) .path = p
+#define __DT_MATCH_TYPE(typ) .type = typ
+#define __DT_MATCH_COMPATIBLE(compat) .compatible = compat
+#define __DT_MATCH_NOT_AVAILABLE() .not_available = 1
+
+#define DT_MATCH_PATH(p) { __DT_MATCH_PATH(p) }
+#define DT_MATCH_TYPE(typ) { __DT_MATCH_TYPE(typ) }
+#define DT_MATCH_COMPATIBLE(compat) { __DT_MATCH_COMPATIBLE(compat) }
+#define DT_MATCH_NOT_AVAILABLE() { __DT_MATCH_NOT_AVAILABLE() }
typedef u32 dt_phandle;
--
1.9.1
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
