Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-27 22:51:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

serial: altera_jtaguart: Adpot uart_console_write()

Browse Source 
Follow commit 2970b7f5ea ("serial: altera: Adopt
uart_console_write()") and don't open code the LF to LFCR conversion in
altera_jtaguart either. Use uart_console_write() instead.

Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Reviewed-by: Daniel Thompson <daniel.thompson@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Tobias Klauser 2014-07-15 17:26:48 +02:00 committed by Greg Kroah-Hartman
parent 4622eb6873
commit 3d1c90d48c
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/tty/serial/altera_jtaguart.c
View File

@ -304,7 +304,7 @@ static struct altera_jtaguart altera_jtaguart_ports[ALTERA_JTAGUART_MAXPORTS];
#if defined(CONFIG_SERIAL_ALTERA_JTAGUART_CONSOLE) #if defined(CONFIG_SERIAL_ALTERA_JTAGUART_CONSOLE)
#if defined(CONFIG_SERIAL_ALTERA_JTAGUART_CONSOLE_BYPASS) #if defined(CONFIG_SERIAL_ALTERA_JTAGUART_CONSOLE_BYPASS)
static void altera_jtaguart_console_putc(struct console *co, const char c) static void altera_jtaguart_console_putc(struct console *co, int c)
{ {
struct uart_port *port = &(altera_jtaguart_ports + co->index)->port; struct uart_port *port = &(altera_jtaguart_ports + co->index)->port;
unsigned long status; unsigned long status;
@ -325,7 +325,7 @@ static void altera_jtaguart_console_putc(struct console *co, const char c)
spin_unlock_irqrestore(&port->lock, flags); spin_unlock_irqrestore(&port->lock, flags);
} }
#else #else
static void altera_jtaguart_console_putc(struct console *co, const char c) static void altera_jtaguart_console_putc(struct console *co, int c)
{ {
struct uart_port *port = &(altera_jtaguart_ports + co->index)->port; struct uart_port *port = &(altera_jtaguart_ports + co->index)->port;
unsigned long flags; unsigned long flags;
@ -345,11 +345,9 @@ static void altera_jtaguart_console_putc(struct console *co, const char c)
static void altera_jtaguart_console_write(struct console *co, const char *s, static void altera_jtaguart_console_write(struct console *co, const char *s,
unsigned int count) unsigned int count)
{ {
for (; count; count--, s++) { struct uart_port *port = &(altera_jtaguart_ports + co->index)->port;
altera_jtaguart_console_putc(co, *s);
if (*s == '\n') uart_console_write(port, s, count, altera_jtaguart_console_putc);
altera_jtaguart_console_putc(co, '\r');
}
} }
static int __init altera_jtaguart_console_setup(struct console *co, static int __init altera_jtaguart_console_setup(struct console *co,