Merge branch 'master' of git://git.denx.de/u-boot-arm

[u-boot] / drivers / serial / serial_ns16550.c

diff --git a/drivers/serial/serial_ns16550.c b/drivers/serial/serial_ns16550.c
index 5fb38410a8420f4d07740eba25c1b165aea5ebf9..c1c0134bcb3fdd8ec7e6c8a93e9f463291b5b9ca 100644 (file)
--- a/drivers/serial/serial_ns16550.c
+++ b/drivers/serial/serial_ns16550.c
@@ -92,21 +92,33 @@ static NS16550_t serial_ports[6] = {
 
 /* Multi serial device functions */
 #define DECLARE_ESERIAL_FUNCTIONS(port) \
-    int  eserial##port##_init (void) {\
-       int clock_divisor; \
-       clock_divisor = calc_divisor(serial_ports[port-1]); \
-       NS16550_init(serial_ports[port-1], clock_divisor); \
-       return(0);}\
-    void eserial##port##_setbrg (void) {\
-       serial_setbrg_dev(port);}\
-    int  eserial##port##_getc (void) {\
-       return serial_getc_dev(port);}\
-    int  eserial##port##_tstc (void) {\
-       return serial_tstc_dev(port);}\
-    void eserial##port##_putc (const char c) {\
-       serial_putc_dev(port, c);}\
-    void eserial##port##_puts (const char *s) {\
-       serial_puts_dev(port, s);}
+       static int  eserial##port##_init(void) \
+       { \
+               int clock_divisor; \
+               clock_divisor = calc_divisor(serial_ports[port-1]); \
+               NS16550_init(serial_ports[port-1], clock_divisor); \
+               return 0 ; \
+       } \
+       static void eserial##port##_setbrg(void) \
+       { \
+               serial_setbrg_dev(port); \
+       } \
+       static int  eserial##port##_getc(void) \
+       { \
+               return serial_getc_dev(port); \
+       } \
+       static int  eserial##port##_tstc(void) \
+       { \
+               return serial_tstc_dev(port); \
+       } \
+       static void eserial##port##_putc(const char c) \
+       { \
+               serial_putc_dev(port, c); \
+       } \
+       static void eserial##port##_puts(const char *s) \
+       { \
+               serial_puts_dev(port, s); \
+       }
 
 /* Serial device descriptor */
 #define INIT_ESERIAL_STRUCTURE(port, __name) { \