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

Commit 5604a98e authored by Peter Hurley's avatar Peter Hurley Committed by Greg Kroah-Hartman
Browse files

tty: Replace ASYNC_CTS_FLOW bit and update atomically 



Replace ASYNC_CTS_FLOW bit in the tty_port::flags field with
TTY_PORT_CTS_FLOW bit in the tty_port::iflags field. Add
tty_port_set_cts_flow() helper to abstract the atomic bit ops.

Signed-off-by: default avatarPeter Hurley <peter@hurleysoftware.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e4d38f33

drivers/char/pcmcia/synclink_cs.c

+1 −4
Original line number Diff line number Diff line
@@ -1466,10 +1466,7 @@ static void mgslpc_change_params(MGSLPC_INFO *info, struct tty_struct *tty) 
	}

	info->timeout += HZ/50;		/* Add .02 seconds of slop */



	if (cflag & CRTSCTS)

		info->port.flags |= ASYNC_CTS_FLOW;

	else

		info->port.flags &= ~ASYNC_CTS_FLOW;

	tty_port_set_cts_flow(&info->port, cflag & CRTSCTS);



	if (cflag & CLOCAL)

		info->port.flags &= ~ASYNC_CHECK_CD;

drivers/tty/amiserial.c

+2 −4
Original line number Diff line number Diff line
@@ -727,11 +727,9 @@ static void change_speed(struct tty_struct *tty, struct serial_state *info, 
	info->IER &= ~UART_IER_MSI;

	if (port->flags & ASYNC_HARDPPS_CD)

		info->IER |= UART_IER_MSI;

	if (cflag & CRTSCTS) {

		port->flags |= ASYNC_CTS_FLOW;

	tty_port_set_cts_flow(port, cflag & CRTSCTS);

	if (cflag & CRTSCTS)

		info->IER |= UART_IER_MSI;

	} else

		port->flags &= ~ASYNC_CTS_FLOW;

	if (cflag & CLOCAL)

		port->flags &= ~ASYNC_CHECK_CD;

	else {

drivers/tty/cyclades.c

+4 −6
Original line number Diff line number Diff line
@@ -2083,13 +2083,11 @@ static void cy_set_line_char(struct cyclades_port *info, struct tty_struct *tty) 
			info->cor1 |= CyPARITY_NONE;



		/* CTS flow control flag */

		if (cflag & CRTSCTS) {

			info->port.flags |= ASYNC_CTS_FLOW;

		tty_port_set_cts_flow(&info->port, cflag & CRTSCTS);

		if (cflag & CRTSCTS)

			info->cor2 |= CyCtsAE;

		} else {

			info->port.flags &= ~ASYNC_CTS_FLOW;

		else

			info->cor2 &= ~CyCtsAE;

		}

		if (cflag & CLOCAL)

			info->port.flags &= ~ASYNC_CHECK_CD;

		else
@@ -2234,7 +2232,7 @@ static void cy_set_line_char(struct cyclades_port *info, struct tty_struct *tty) 
		}

		/* As the HW flow control is done in firmware, the driver

		   doesn't need to care about it */

		info->port.flags &= ~ASYNC_CTS_FLOW;

		tty_port_set_cts_flow(&info->port, 0);



		/* XON/XOFF/XANY flow control flags */

		sw_flow = 0;

drivers/tty/isicom.c

+2 −4
Original line number Diff line number Diff line
@@ -765,11 +765,9 @@ static void isicom_config_port(struct tty_struct *tty) 


	/* flow control settings ...*/

	flow_ctrl = 0;

	port->port.flags &= ~ASYNC_CTS_FLOW;

	if (C_CRTSCTS(tty)) {

		port->port.flags |= ASYNC_CTS_FLOW;

	tty_port_set_cts_flow(&port->port, C_CRTSCTS(tty));

	if (C_CRTSCTS(tty))

		flow_ctrl |= ISICOM_CTSRTS;

	}

	if (I_IXON(tty))

		flow_ctrl |= ISICOM_RESPOND_XONXOFF;

	if (I_IXOFF(tty))

drivers/tty/mxser.c

+1 −3
Original line number Diff line number Diff line
@@ -711,8 +711,8 @@ static int mxser_change_speed(struct tty_struct *tty, 
	/* CTS flow control flag and modem status interrupts */

	info->IER &= ~UART_IER_MSI;

	info->MCR &= ~UART_MCR_AFE;

	tty_port_set_cts_flow(&info->port, cflag & CRTSCTS);

	if (cflag & CRTSCTS) {

		info->port.flags |= ASYNC_CTS_FLOW;

		info->IER |= UART_IER_MSI;

		if ((info->type == PORT_16550A) || (info->board->chip_flag)) {

			info->MCR |= UART_MCR_AFE;
@@ -744,8 +744,6 @@ static int mxser_change_speed(struct tty_struct *tty, 
				}

			}

		}

	} else {

		info->port.flags &= ~ASYNC_CTS_FLOW;

	}

	outb(info->MCR, info->ioaddr + UART_MCR);

	if (cflag & CLOCAL) {