drivers: serial: Make serial_initialize return int

serial_initialize is called only during the common init sequence, after
relocation (in common/board_r.c). Because it has a void return value, it
has to wrapped in initr_serial. In order to be able to get rid of this
indirection, make serial_initialize return int.

Remove extern from prototype in order to silence the following checkpatch
warning:
check: extern prototypes should be avoided in .h files

Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>

diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c
index a0af0e6bfde265952e2126c7087f4b9053c9417b..0027625ebfd1e39eeb8c09f09d10d87a704e7148 100644 (file)
--- a/drivers/serial/serial-uclass.c
+++ b/drivers/serial/serial-uclass.c
@@ -170,9 +170,9 @@ int serial_init(void)
 }
 
 /* Called after relocation */
-void serial_initialize(void)
+int serial_initialize(void)
 {
-       serial_init();
+       return serial_init();
 }
 
 static void _serial_putc(struct udevice *dev, char ch)

diff --git a/drivers/serial/serial.c b/drivers/serial/serial.c
index da017dc5b3e3d8bed0263d1c8b753c47e2520196..53358acb81f2087589aae813d3559ac149acc769 100644 (file)
--- a/drivers/serial/serial.c
+++ b/drivers/serial/serial.c
@@ -170,7 +170,7 @@ void serial_register(struct serial_device *dev)
  * serial port to the serial core. That serial port is then used as a
  * default output.
  */
-void serial_initialize(void)
+int serial_initialize(void)
 {
        atmel_serial_initialize();
        mcf_serial_initialize();
@@ -183,6 +183,8 @@ void serial_initialize(void)
        mtk_serial_initialize();
 
        serial_assign(default_serial_console()->name);
+
+       return 0;
 }
 
 static int serial_stub_start(struct stdio_dev *sdev)

diff --git a/include/serial.h b/include/serial.h
index c590637b1f3bade45cea412b1076a848f78f0ad9..6d1e62c6770c4982ad1ef543347fb514f652f6dc 100644 (file)
--- a/include/serial.h
+++ b/include/serial.h
@@ -42,10 +42,10 @@ extern struct serial_device eserial5_device;
 extern struct serial_device eserial6_device;
 
 extern void serial_register(struct serial_device *);
-extern void serial_initialize(void);
 extern void serial_stdio_init(void);
 extern int serial_assign(const char *name);
 extern void serial_reinit_all(void);
+int serial_initialize(void);
 
 /* For usbtty */
 #ifdef CONFIG_USB_TTY