X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=board%2Flogicpd%2Fzoom2%2Fzoom2_serial.h;h=482fe2ec9d820ee9dfd35814d031efbbccd2864e;hb=5053b593009a0b5645f32c9b7365c587138e1afd;hp=a6d2427fef028e3ee7d0efbe7d5d07c5495da7cd;hpb=c88d6ab19ffab06f372b15c290bdf5d6f1ebfe9a;p=u-boot

diff --git a/board/logicpd/zoom2/zoom2_serial.h b/board/logicpd/zoom2/zoom2_serial.h
index a6d2427fef..482fe2ec9d 100644
--- a/board/logicpd/zoom2/zoom2_serial.h
+++ b/board/logicpd/zoom2/zoom2_serial.h
@@ -22,6 +22,8 @@
 #ifndef ZOOM2_SERIAL_H
 #define ZOOM2_SERIAL_H
 
+#include <linux/stringify.h>
+
 extern int zoom2_debug_board_connected (void);
 
 #define SERIAL_TL16CP754C_BASE	0x10000000	/* Zoom2 Serial chip address */
@@ -31,10 +33,6 @@ extern int zoom2_debug_board_connected (void);
 #define QUAD_BASE_2	(SERIAL_TL16CP754C_BASE + 0x200)
 #define QUAD_BASE_3	(SERIAL_TL16CP754C_BASE + 0x300)
 
-#define S(a) #a
-#define N(a) S(quad##a)
-#define U(a) S(UART##a)
-
 #define QUAD_INIT(n)				\
 int quad_init_##n(void)				\
 {						\
@@ -62,15 +60,14 @@ int quad_tstc_##n(void)				\
 }						\
 struct serial_device zoom2_serial_device##n =	\
 {						\
-	N(n),					\
-	U(n),					\
-	quad_init_##n,				\
-	NULL,					\
-	quad_setbrg_##n,			\
-	quad_getc_##n,				\
-	quad_tstc_##n,				\
-	quad_putc_##n,				\
-	quad_puts_##n,				\
+	.name	= __stringify(n),		\
+	.start	= quad_init_##n,		\
+	.stop	= NULL,				\
+	.setbrg	= quad_setbrg_##n,		\
+	.getc	= quad_getc_##n,		\
+	.tstc	= quad_tstc_##n,		\
+	.putc	= quad_putc_##n,		\
+	.puts	= quad_puts_##n,		\
 };
 
 #endif /* ZOOM2_SERIAL_H */