Skip to content

Commit

Permalink
serial: pch_uart: remove unnecessary tty_port_tty_get
Browse files Browse the repository at this point in the history
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: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Johan Hovold authored and Greg Kroah-Hartman committed Sep 17, 2013
1 parent 19b85cf commit 0b53861
Showing 1 changed file with 1 addition and 11 deletions.
12 changes: 1 addition & 11 deletions drivers/tty/serial/pch_uart.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down

0 comments on commit 0b53861

Please sign in to comment.