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

Commit 2970b7f5 authored by Daniel Thompson's avatar Daniel Thompson Committed by Greg Kroah-Hartman
Browse files

serial: altera: Adopt uart_console_write() 



This driver does not currently use uart_console_write() and instead
provides is own LF to LFCR conversion in it's console_write() method.
We should use the library function instead.

Cmopile tested only (with ARCH=arm).

Signed-off-by: default avatarDaniel Thompson <daniel.thompson@linaro.org>
Cc: Tobias Klauser <tklauser@distanz.ch>
Cc: Jiri Slaby <jslaby@suse.cz>
Cc: linux-serial@vger.kernel.org
Cc: nios2-dev@lists.rocketboards.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d36f47fa

drivers/tty/serial/altera_uart.c

+2 −6
Original line number Diff line number Diff line
@@ -430,7 +430,7 @@ static struct altera_uart altera_uart_ports[CONFIG_SERIAL_ALTERA_UART_MAXPORTS]; 


#if defined(CONFIG_SERIAL_ALTERA_UART_CONSOLE)



static void altera_uart_console_putc(struct uart_port *port, const char c)

static void altera_uart_console_putc(struct uart_port *port, int c)

{

	while (!(altera_uart_readl(port, ALTERA_UART_STATUS_REG) &

		 ALTERA_UART_STATUS_TRDY_MSK))
@@ -444,11 +444,7 @@ static void altera_uart_console_write(struct console *co, const char *s, 
{

	struct uart_port *port = &(altera_uart_ports + co->index)->port;



	for (; count; count--, s++) {

		altera_uart_console_putc(port, *s);

		if (*s == '\n')

			altera_uart_console_putc(port, '\r');

	}

	uart_console_write(port, s, count, altera_uart_console_putc);

}



static int __init altera_uart_console_setup(struct console *co, char *options)