[U-Boot] [PATCH 17/72] serial: bfin: Adjust serial_register_bfin_uart()

Marek Vasut marex at denx.de
Sat Sep 29 23:52:10 CEST 2012


Rename the serial_register_bfin_uart() to bfin_initialize_serial()
to be consistent with the rest of the naming. Next, remove it's
prototype from serial.h and properly insert it into serial.c as
the rest of the serial initialization functions.

Signed-off-by: Marek Vasut <marex at denx.de>
Cc: Marek Vasut <marek.vasut at gmail.com>
Cc: Tom Rini <trini at ti.com>
Cc: Mike Frysinger <vapier at gentoo.org>
---
 arch/blackfin/cpu/serial.c |    2 +-
 common/serial.c            |    5 ++---
 include/serial.h           |    4 ----
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/arch/blackfin/cpu/serial.c b/arch/blackfin/cpu/serial.c
index 33677ba..64340ec 100644
--- a/arch/blackfin/cpu/serial.c
+++ b/arch/blackfin/cpu/serial.c
@@ -272,7 +272,7 @@ __weak struct serial_device *default_serial_console(void)
 #endif
 }
 
-void serial_register_bfin_uart(void)
+void bfin_serial_initialize(void)
 {
 #ifdef UART0_DLL
 	serial_register(&bfin_serial0_device);
diff --git a/common/serial.c b/common/serial.c
index faad804..0a43c1b 100644
--- a/common/serial.c
+++ b/common/serial.c
@@ -45,6 +45,7 @@ serial_initfunc(ns16550_serial_initialize);
 serial_initfunc(pxa_serial_initialize);
 serial_initfunc(s3c24xx_serial_initialize);
 serial_initfunc(s5p_serial_initialize);
+serial_initfunc(bfin_serial_initialize);
 serial_initfunc(mpc512x_serial_initialize);
 serial_initfunc(uartlite_serial_initialize);
 
@@ -71,9 +72,7 @@ void serial_initialize(void)
 	s3c24xx_serial_initialize();
 	s5p_serial_initialize();
 	mpc512x_serial_initialize();
-#if defined(CONFIG_SYS_BFIN_UART)
-	serial_register_bfin_uart();
-#endif
+	bfin_serial_initialize();
 	uartlite_serial_initialize();
 	serial_assign(default_serial_console()->name);
 }
diff --git a/include/serial.h b/include/serial.h
index 00efe68..5f9899e 100644
--- a/include/serial.h
+++ b/include/serial.h
@@ -46,10 +46,6 @@ extern struct serial_device zoom2_serial_device2;
 extern struct serial_device zoom2_serial_device3;
 #endif
 
-#if defined(CONFIG_SYS_BFIN_UART)
-extern void serial_register_bfin_uart(void);
-#endif
-
 extern void serial_register(struct serial_device *);
 extern void serial_initialize(void);
 extern void serial_stdio_init(void);
-- 
1.7.10.4



More information about the U-Boot mailing list