Commit 3ec2ff37 authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman
Browse files

tty: make use of tty_get_{char,frame}_size 



In the previous patch, we introduced tty_get_char_size() and
tty_get_frame_size() for computing character and frame sizes,
respectively. Here, we make use of them in various tty drivers where
applicable.

The stats look nice: 12 insertions, 169 deletions.

Cc: Arnd Bergmann <arnd@arndb.de>
Cc: David Lin <dtwlin@gmail.com>
Cc: Johan Hovold <johan@kernel.org>
Cc: Alex Elder <elder@kernel.org>
Cc: Shawn Guo <shawnguo@kernel.org>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
Cc: Andy Gross <agross@kernel.org>
Cc: Bjorn Andersson <bjorn.andersson@linaro.org>
Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com>
Cc: Alexandre Torgue <alexandre.torgue@foss.st.com>
Cc: Oliver Neukum <oneukum@suse.com>
Acked-by: default avatarAlex Elder <elder@kernel.org>
Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20210610090247.2593-4-jslaby@suse.cz


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

drivers/char/pcmcia/synclink_cs.c

+1 −7
Original line number Diff line number Diff line
@@ -1419,13 +1419,7 @@ static void mgslpc_change_params(MGSLPC_INFO *info, struct tty_struct *tty) 


	/* byte size and parity */



	switch (cflag & CSIZE) {

	case CS5: info->params.data_bits = 5; break;

	case CS6: info->params.data_bits = 6; break;

	case CS7: info->params.data_bits = 7; break;

	case CS8: info->params.data_bits = 8; break;

	default:  info->params.data_bits = 7; break;

	}

	info->params.data_bits = tty_get_char_size(cflag);



	if (cflag & CSTOPB)

		info->params.stop_bits = 2;

drivers/staging/greybus/uart.c

+1 −15
Original line number Diff line number Diff line
@@ -494,21 +494,7 @@ static void gb_tty_set_termios(struct tty_struct *tty, 
				(termios->c_cflag & PARODD ? 1 : 2) +

				(termios->c_cflag & CMSPAR ? 2 : 0) : 0;



	switch (termios->c_cflag & CSIZE) {

	case CS5:

		newline.data_bits = 5;

		break;

	case CS6:

		newline.data_bits = 6;

		break;

	case CS7:

		newline.data_bits = 7;

		break;

	case CS8:

	default:

		newline.data_bits = 8;

		break;

	}

	newline.data_bits = tty_get_char_size(termios->c_cflag);



	/* FIXME: needs to clear unsupported bits in the termios */

	gb_tty->clocal = ((termios->c_cflag & CLOCAL) != 0);

drivers/tty/serial/cpm_uart/cpm_uart_core.c

+1 −18
Original line number Diff line number Diff line
@@ -524,24 +524,7 @@ static void cpm_uart_set_termios(struct uart_port *port, 
	scval = 0;



	/* byte size */

	switch (termios->c_cflag & CSIZE) {

	case CS5:

		bits = 5;

		break;

	case CS6:

		bits = 6;

		break;

	case CS7:

		bits = 7;

		break;

	case CS8:

		bits = 8;

		break;

		/* Never happens, but GCC is too dumb to figure it out */

	default:

		bits = 8;

		break;

	}

	bits = tty_get_char_size(termios->c_cflag);

	sbits = bits - 5;



	if (termios->c_cflag & CSTOPB) {

drivers/tty/serial/mxs-auart.c

+2 −20
Original line number Diff line number Diff line
@@ -962,7 +962,7 @@ static void mxs_auart_settermios(struct uart_port *u, 
				 struct ktermios *old)

{

	struct mxs_auart_port *s = to_auart_port(u);

	u32 bm, ctrl, ctrl2, div;

	u32 ctrl, ctrl2, div;

	unsigned int cflag, baud, baud_min, baud_max;



	cflag = termios->c_cflag;
@@ -970,25 +970,7 @@ static void mxs_auart_settermios(struct uart_port *u, 
	ctrl = AUART_LINECTRL_FEN;

	ctrl2 = mxs_read(s, REG_CTRL2);



	/* byte size */

	switch (cflag & CSIZE) {

	case CS5:

		bm = 5;

		break;

	case CS6:

		bm = 6;

		break;

	case CS7:

		bm = 7;

		break;

	case CS8:

		bm = 8;

		break;

	default:

		return;

	}



	ctrl |= AUART_LINECTRL_WLEN(bm);

	ctrl |= AUART_LINECTRL_WLEN(tty_get_char_size(cflag));



	/* parity */

	if (cflag & PARENB) {

drivers/tty/serial/qcom_geni_serial.c

+1 −15
Original line number Diff line number Diff line
@@ -1050,21 +1050,7 @@ static void qcom_geni_serial_set_termios(struct uart_port *uport, 
	}



	/* bits per char */

	switch (termios->c_cflag & CSIZE) {

	case CS5:

		bits_per_char = 5;

		break;

	case CS6:

		bits_per_char = 6;

		break;

	case CS7:

		bits_per_char = 7;

		break;

	case CS8:

	default:

		bits_per_char = 8;

		break;

	}

	bits_per_char = tty_get_char_size(termios->c_cflag);



	/* stop bits */

	if (termios->c_cflag & CSTOPB)