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

Commit fd401aee authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[SERIAL] Remove incorrect code from ioc4 serial driver 



Serial drivers in general should not write uart_info->flags - they're
private to serial_core.  Serial drivers have no need to fiddle with
tty->alt_speed, nor manipulate TTY_IO_ERROR in tty->flags.  Fix the
ioc4 serial driver for both these points by simply removing the
offending code.

Acked-by: default avatar <pfg@sgi.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 5bc159e6

drivers/serial/ioc4_serial.c

+0 −14
Original line number Diff line number Diff line
@@ -1717,11 +1717,9 @@ ioc4_change_speed(struct uart_port *the_port, 
	}



	if (cflag & CRTSCTS) {

		info->flags |= ASYNC_CTS_FLOW;

		port->ip_sscr |= IOC4_SSCR_HFC_EN;

	}

	else {

		info->flags &= ~ASYNC_CTS_FLOW;

		port->ip_sscr &= ~IOC4_SSCR_HFC_EN;

	}

	writel(port->ip_sscr, &port->ip_serial_regs->sscr);
@@ -1760,18 +1758,6 @@ static inline int ic4_startup_local(struct uart_port *the_port) 


	info = the_port->info;



	if (info->tty) {

		set_bit(TTY_IO_ERROR, &info->tty->flags);

		clear_bit(TTY_IO_ERROR, &info->tty->flags);

		if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_HI)

			info->tty->alt_speed = 57600;

		if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_VHI)

			info->tty->alt_speed = 115200;

		if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_SHI)

			info->tty->alt_speed = 230400;

		if ((info->flags & ASYNC_SPD_MASK) == ASYNC_SPD_WARP)

			info->tty->alt_speed = 460800;

	}

	local_open(port);



	/* set the speed of the serial port */