Commit 7ec3114e authored by Jiri Slaby's avatar Jiri Slaby Committed by Greg Kroah-Hartman
Browse files

amiserial: simplify rs_open 



tty->port is already set when rs_open is called given we linked it by
tty_port_link_device(). If it wasn't, the tty layer would WARN loudly.
So it's pointless to set it in rs_open. Instead, use the value in
tty->port to find out the serial_state (info).

It's a fallout of commit b19e2ca7 (TTY: use tty_port_link_device)
which added tty_port_link_device here, but omitted to remove the
tty->port assignment from rs_open.

Signed-off-by: default avatarJiri Slaby <jslaby@suse.cz>
Link: https://lore.kernel.org/r/20210714091314.8292-5-jslaby@suse.cz


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

drivers/tty/amiserial.c

+3 −3
Original line number Diff line number Diff line
@@ -1361,14 +1361,14 @@ static void rs_hangup(struct tty_struct *tty) 
 */

static int rs_open(struct tty_struct *tty, struct file * filp)

{

	struct serial_state *info = rs_table + tty->index;

	struct tty_port *port = &info->tport;

	struct tty_port *port = tty->port;

	struct serial_state *info = container_of(port, struct serial_state,

			tport);

	int retval;



	port->count++;

	port->tty = tty;

	tty->driver_data = info;

	tty->port = port;



	retval = startup(tty, info);

	if (retval) {