Commit 988c5bbe authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman
Browse files

tty: serial: make use of UART_LCR_WLEN() + tty_get_char_size() 



Having a generic UART_LCR_WLEN() macro and the tty_get_char_size()
helper, we can remove all those repeated switch-cases in drivers.

Cc: Laxman Dewangan <ldewangan@nvidia.com>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: Jonathan Hunter <jonathanh@nvidia.com>
Cc: linux-tegra@vger.kernel.org
Reviewed-by: default avatarThierry Reding <treding@nvidia.com>
Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20220224095558.30929-2-jslaby@suse.cz


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 797bd4d4

drivers/tty/serial/8250/8250_omap.c

+1 −15
Original line number Diff line number Diff line
@@ -357,21 +357,7 @@ static void omap_8250_set_termios(struct uart_port *port, 
	unsigned char cval = 0;

	unsigned int baud;



	switch (termios->c_cflag & CSIZE) {

	case CS5:

		cval = UART_LCR_WLEN5;

		break;

	case CS6:

		cval = UART_LCR_WLEN6;

		break;

	case CS7:

		cval = UART_LCR_WLEN7;

		break;

	default:

	case CS8:

		cval = UART_LCR_WLEN8;

		break;

	}

	cval = UART_LCR_WLEN(tty_get_char_size(termios->c_cflag));



	if (termios->c_cflag & CSTOPB)

		cval |= UART_LCR_STOP;

drivers/tty/serial/8250/8250_port.c

+1 −15
Original line number Diff line number Diff line
@@ -2605,21 +2605,7 @@ static unsigned char serial8250_compute_lcr(struct uart_8250_port *up, 
{

	unsigned char cval;



	switch (c_cflag & CSIZE) {

	case CS5:

		cval = UART_LCR_WLEN5;

		break;

	case CS6:

		cval = UART_LCR_WLEN6;

		break;

	case CS7:

		cval = UART_LCR_WLEN7;

		break;

	default:

	case CS8:

		cval = UART_LCR_WLEN8;

		break;

	}

	cval = UART_LCR_WLEN(tty_get_char_size(c_cflag));



	if (c_cflag & CSTOPB)

		cval |= UART_LCR_STOP;

drivers/tty/serial/jsm/jsm_cls.c

+1 −15
Original line number Diff line number Diff line
@@ -737,21 +737,7 @@ static void cls_param(struct jsm_channel *ch) 
	if (ch->ch_c_cflag & CSTOPB)

		lcr |= UART_LCR_STOP;



	switch (ch->ch_c_cflag & CSIZE) {

	case CS5:

		lcr |= UART_LCR_WLEN5;

		break;

	case CS6:

		lcr |= UART_LCR_WLEN6;

		break;

	case CS7:

		lcr |= UART_LCR_WLEN7;

		break;

	case CS8:

	default:

		lcr |= UART_LCR_WLEN8;

		break;

	}

	lcr |= UART_LCR_WLEN(tty_get_char_size(ch->ch_c_cflag));



	ier = readb(&ch->ch_cls_uart->ier);

	uart_lcr = readb(&ch->ch_cls_uart->lcr);

drivers/tty/serial/jsm/jsm_neo.c

+1 −15
Original line number Diff line number Diff line
@@ -1008,21 +1008,7 @@ static void neo_param(struct jsm_channel *ch) 
	if (ch->ch_c_cflag & CSTOPB)

		lcr |= UART_LCR_STOP;



	switch (ch->ch_c_cflag & CSIZE) {

	case CS5:

		lcr |= UART_LCR_WLEN5;

		break;

	case CS6:

		lcr |= UART_LCR_WLEN6;

		break;

	case CS7:

		lcr |= UART_LCR_WLEN7;

		break;

	case CS8:

	default:

		lcr |= UART_LCR_WLEN8;

	break;

	}

	lcr |= UART_LCR_WLEN(tty_get_char_size(ch->ch_c_cflag));



	ier = readb(&ch->ch_neo_uart->ier);

	uart_lcr = readb(&ch->ch_neo_uart->lcr);

drivers/tty/serial/omap-serial.c

+1 −15
Original line number Diff line number Diff line
@@ -808,21 +808,7 @@ serial_omap_set_termios(struct uart_port *port, struct ktermios *termios, 
	unsigned long flags;

	unsigned int baud, quot;



	switch (termios->c_cflag & CSIZE) {

	case CS5:

		cval = UART_LCR_WLEN5;

		break;

	case CS6:

		cval = UART_LCR_WLEN6;

		break;

	case CS7:

		cval = UART_LCR_WLEN7;

		break;

	default:

	case CS8:

		cval = UART_LCR_WLEN8;

		break;

	}

	cval = UART_LCR_WLEN(tty_get_char_size(termios->c_cflag));



	if (termios->c_cflag & CSTOPB)

		cval |= UART_LCR_STOP;