mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-04 01:49:36 +00:00
serial: altera_jtaguart: Adpot uart_console_write()
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:
parent
4622eb6873
commit
3d1c90d48c
1 changed files with 5 additions and 7 deletions
|
@ -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_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;
|
||||
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);
|
||||
}
|
||||
#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;
|
||||
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,
|
||||
unsigned int count)
|
||||
{
|
||||
for (; count; count--, s++) {
|
||||
altera_jtaguart_console_putc(co, *s);
|
||||
if (*s == '\n')
|
||||
altera_jtaguart_console_putc(co, '\r');
|
||||
}
|
||||
struct uart_port *port = &(altera_jtaguart_ports + co->index)->port;
|
||||
|
||||
uart_console_write(port, s, count, altera_jtaguart_console_putc);
|
||||
}
|
||||
|
||||
static int __init altera_jtaguart_console_setup(struct console *co,
|
||||
|
|
Loading…
Reference in a new issue