serial: bfin: Adjust serial_register_bfin_uart()

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@denx.de>
Cc: Marek Vasut <marek.vasut@gmail.com>
Cc: Tom Rini <trini@ti.com>
Cc: Mike Frysinger <vapier@gentoo.org>

diff --git a/arch/blackfin/cpu/serial.c b/arch/blackfin/cpu/serial.c
index 33677ba5aaf50d6661d8ebd461eb68949da7f727..64340ec67d552c62211aa4ca18b152d6284a5985 100644 (file)
--- 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 84f05df8e1f4f9abdfc00ecf5c4bf7b46d639858..545f9e7ec067055e75be2d1c98ff564fd292fe24 100644 (file)
--- a/common/serial.c
+++ b/common/serial.c
@@ -46,6 +46,7 @@ serial_initfunc(pxa_serial_initialize);
 serial_initfunc(s3c24xx_serial_initialize);
 serial_initfunc(s5p_serial_initialize);
 serial_initfunc(zynq_serial_initalize);
+serial_initfunc(bfin_serial_initialize);
 serial_initfunc(mpc512x_serial_initialize);
 serial_initfunc(uartlite_serial_initialize);
 
@@ -72,9 +73,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();
        zynq_serial_initalize();
        serial_assign(default_serial_console()->name);

diff --git a/include/serial.h b/include/serial.h
index 00efe68272e09be175e56f44c3b34f4cef6e9454..5f9899ed21214b656a1edbe48ffad55b0600b55b 100644 (file)
--- 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);