evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Blackfin Serial Driver: Clean serial console and early prink code.

Browse source 
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Sonic Zhang 2009-01-02 13:40:31 +00:00 • committed by Linus Torvalds
parent 80d5c474b8
commit b6efa1eabb
1 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/serial/bfin_5xx.c
View file

@ -986,7 +986,7 @@ static void __init bfin_serial_init_ports(void)
} }
#ifdef CONFIG_SERIAL_BFIN_CONSOLE #if defined(CONFIG_SERIAL_BFIN_CONSOLE) || defined(CONFIG_EARLY_PRINTK)
/* /*
* If the port was already initialised (eg, by a boot loader), * If the port was already initialised (eg, by a boot loader),
* try to determine the current setup. * try to determine the current setup.
@ -1030,24 +1030,20 @@ bfin_serial_console_get_options(struct bfin_serial_port *uart, int *baud,
} }
pr_debug("%s:baud = %d, parity = %c, bits= %d\n", __func__, *baud, *parity, *bits); pr_debug("%s:baud = %d, parity = %c, bits= %d\n", __func__, *baud, *parity, *bits);
} }
#endif
#if defined(CONFIG_SERIAL_BFIN_CONSOLE) || defined(CONFIG_EARLY_PRINTK)
static struct uart_driver bfin_serial_reg; static struct uart_driver bfin_serial_reg;
static int __init static int __init
bfin_serial_console_setup(struct console *co, char *options) bfin_serial_console_setup(struct console *co, char *options)
{ {
struct bfin_serial_port *uart; struct bfin_serial_port *uart;
# ifdef CONFIG_SERIAL_BFIN_CONSOLE
int baud = 57600; int baud = 57600;
int bits = 8; int bits = 8;
int parity = 'n'; int parity = 'n';
# ifdef CONFIG_SERIAL_BFIN_CTSRTS # ifdef CONFIG_SERIAL_BFIN_CTSRTS
int flow = 'r'; int flow = 'r';
# else # else
int flow = 'n'; int flow = 'n';
# endif
# endif # endif
/* /*
@ -1059,16 +1055,12 @@ bfin_serial_console_setup(struct console *co, char *options)
co->index = 0; co->index = 0;
uart = &bfin_serial_ports[co->index]; uart = &bfin_serial_ports[co->index];
# ifdef CONFIG_SERIAL_BFIN_CONSOLE
if (options) if (options)
uart_parse_options(options, &baud, &parity, &bits, &flow); uart_parse_options(options, &baud, &parity, &bits, &flow);
else else
bfin_serial_console_get_options(uart, &baud, &parity, &bits); bfin_serial_console_get_options(uart, &baud, &parity, &bits);
return uart_set_options(&uart->port, co, baud, parity, bits, flow); return uart_set_options(&uart->port, co, baud, parity, bits, flow);
# else
return 0;
# endif
} }
#endif /* defined (CONFIG_SERIAL_BFIN_CONSOLE) || #endif /* defined (CONFIG_SERIAL_BFIN_CONSOLE) ||
defined (CONFIG_EARLY_PRINTK) */ defined (CONFIG_EARLY_PRINTK) */
@ -1177,7 +1169,7 @@ struct console __init *bfin_earlyserial_init(unsigned int port,
return &bfin_early_serial_console; return &bfin_early_serial_console;
} }
#endif /* CONFIG_SERIAL_BFIN_CONSOLE */ #endif /* CONFIG_EARLY_PRINTK */
static struct uart_driver bfin_serial_reg = { static struct uart_driver bfin_serial_reg = {
.owner = THIS_MODULE, .owner = THIS_MODULE,