From f1e1897ade15e8d902344ffe4c388c68fba02b51 Mon Sep 17 00:00:00 2001 From: Andrei Emeltchenko Date: Thu, 23 Apr 2015 10:41:50 +0300 Subject: [PATCH] console: Replace uartConsoleInit with uart_console_init Rename camelCase uartConsoleInit function for consistency with the rest of the code in serial console. Change-Id: I519737070538e9c0f52a8d110a3eff68e0185ce2 Signed-off-by: Andrei Emeltchenko --- arch/arm/fsl_frdm_k64f/system.c | 2 +- arch/arm/ti_lm3s6965/system.c | 2 +- arch/x86/generic_pc/system.c | 2 +- arch/x86/quark/system.c | 2 +- drivers/console/uart_console.c | 4 ++-- drivers/console/uart_console.h | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/arm/fsl_frdm_k64f/system.c b/arch/arm/fsl_frdm_k64f/system.c index 70c9d3db2d6..448cd7b6912 100644 --- a/arch/arm/fsl_frdm_k64f/system.c +++ b/arch/arm/fsl_frdm_k64f/system.c @@ -293,7 +293,7 @@ static void consoleInit(void) uart_init(CONFIG_UART_CONSOLE_INDEX, &info); - uartConsoleInit(); + uart_console_init(); } #else diff --git a/arch/arm/ti_lm3s6965/system.c b/arch/arm/ti_lm3s6965/system.c index 8ecfcf8cb5f..291cd97a045 100644 --- a/arch/arm/ti_lm3s6965/system.c +++ b/arch/arm/ti_lm3s6965/system.c @@ -107,7 +107,7 @@ static void consoleInit(void) uart_init(CONFIG_UART_CONSOLE_INDEX, &info); - uartConsoleInit(); + uart_console_init(); } #else diff --git a/arch/x86/generic_pc/system.c b/arch/x86/generic_pc/system.c index 7217f841b64..8572883a13b 100644 --- a/arch/x86/generic_pc/system.c +++ b/arch/x86/generic_pc/system.c @@ -138,7 +138,7 @@ static void consoleInit(void) info.irq = CONFIG_UART_CONSOLE_IRQ; info.int_pri = CONFIG_UART_CONSOLE_INT_PRI; uart_init(CONFIG_UART_CONSOLE_INDEX, &info); - uartConsoleInit(); + uart_console_init(); } #else diff --git a/arch/x86/quark/system.c b/arch/x86/quark/system.c index 6497d73ab62..f12ec24a2eb 100644 --- a/arch/x86/quark/system.c +++ b/arch/x86/quark/system.c @@ -139,7 +139,7 @@ static void consoleInit(void) info.regs = _SysPciMap(addr, size); uart_init(CONFIG_UART_CONSOLE_INDEX, &info); - uartConsoleInit(); + uart_console_init(); } #else diff --git a/drivers/console/uart_console.c b/drivers/console/uart_console.c index 59398bc809f..87e3b0e5bc8 100644 --- a/drivers/console/uart_console.c +++ b/drivers/console/uart_console.c @@ -194,12 +194,12 @@ void uart_register_handler(void (*cb) (const char *string)) /****************************************************************************** * - * uartConsoleInit - initialize one UART as the console/debug port + * uart_console_init - initialize one UART as the console/debug port * * RETURNS: N/A */ -void uartConsoleInit(void) +void uart_console_init(void) { __stdout_hook_install(consoleOut); __printk_hook_install(consoleOut); diff --git a/drivers/console/uart_console.h b/drivers/console/uart_console.h index d85b13292f6..64ffa99f7bb 100644 --- a/drivers/console/uart_console.h +++ b/drivers/console/uart_console.h @@ -39,7 +39,7 @@ extern "C" { #include -extern void uartConsoleInit(void); +extern void uart_console_init(void); /* * Register callback function which gets called when string typed in