brain-hackers_pepepper-mirror
/
u-boot-brain
mirror of https://github.com/brain-hackers/u-boot-brain
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Ovidiu Panait 2020-07-24 14:12:22 +03:00 committed by Tom Rini
parent 3a4b52a9e5
commit 39a192231b
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/serial/serial-uclass.c
View File

@ -170,9 +170,9 @@ int serial_init(void)
} }
/* Called after relocation */ /* 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) static void _serial_putc(struct udevice *dev, char ch)

4
drivers/serial/serial.c
View File

@ -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 * serial port to the serial core. That serial port is then used as a
* default output. * default output.
*/ */
void serial_initialize(void) int serial_initialize(void)
{ {
atmel_serial_initialize(); atmel_serial_initialize();
mcf_serial_initialize(); mcf_serial_initialize();
@ -183,6 +183,8 @@ void serial_initialize(void)
mtk_serial_initialize(); mtk_serial_initialize();
serial_assign(default_serial_console()->name); serial_assign(default_serial_console()->name);
return 0;
} }
static int serial_stub_start(struct stdio_dev *sdev) static int serial_stub_start(struct stdio_dev *sdev)

2
include/serial.h
View File

@ -42,10 +42,10 @@ extern struct serial_device eserial5_device;
extern struct serial_device eserial6_device; extern struct serial_device eserial6_device;
extern void serial_register(struct serial_device *); extern void serial_register(struct serial_device *);
extern void serial_initialize(void);
extern void serial_stdio_init(void); extern void serial_stdio_init(void);
extern int serial_assign(const char *name); extern int serial_assign(const char *name);
extern void serial_reinit_all(void); extern void serial_reinit_all(void);
int serial_initialize(void);
/* For usbtty */ /* For usbtty */
#ifdef CONFIG_USB_TTY #ifdef CONFIG_USB_TTY