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

Commit 0b538612 authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

serial: pch_uart: remove unnecessary tty_port_tty_get 



Remove unused tty-reference from dma-rx path which was left after the
recent tty-port conversions.

Also remove a redundant port initialisation while at it.

Signed-off-by: default avatarJohan Hovold <jhovold@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 19b85cfb

drivers/tty/serial/pch_uart.c

+1 −11
Original line number Diff line number Diff line
@@ -667,31 +667,21 @@ static int pop_tx_x(struct eg20t_port *priv, unsigned char *buf) 


static int dma_push_rx(struct eg20t_port *priv, int size)

{

	struct tty_struct *tty;

	int room;

	struct uart_port *port = &priv->port;

	struct tty_port *tport = &port->state->port;



	port = &priv->port;

	tty = tty_port_tty_get(tport);

	if (!tty) {

		dev_dbg(priv->port.dev, "%s:tty is busy now", __func__);

		return 0;

	}



	room = tty_buffer_request_room(tport, size);



	if (room < size)

		dev_warn(port->dev, "Rx overrun: dropping %u bytes\n",

			 size - room);

	if (!room)

		goto out;

		return 0;



	tty_insert_flip_string(tport, sg_virt(&priv->sg_rx), size);



	port->icount.rx += room;

out:

	tty_kref_put(tty);



	return room;

}