Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d1c90d4 authored by Tobias Klauser's avatar Tobias Klauser Committed by Greg Kroah-Hartman
Browse files

serial: altera_jtaguart: Adpot uart_console_write() 



Follow commit 2970b7f5 ("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: default avatarTobias Klauser <tklauser@distanz.ch>
Reviewed-by: default avatarDaniel Thompson <daniel.thompson@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4622eb68

drivers/tty/serial/altera_jtaguart.c

+5 −7
Original line number Diff line number Diff line
@@ -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,