linux-serial.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Heikki Krogerus <heikki.krogerus@linux.intel.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Alan Cox <alan@linux.intel.com>, linux-serial@vger.kernel.org
Subject: [PATCH 1/4] serial: 8250_dma: Switch to using tty_port
Date: Wed, 16 Jan 2013 14:08:13 +0200	[thread overview]
Message-ID: <1358338096-32081-2-git-send-email-heikki.krogerus@linux.intel.com> (raw)
In-Reply-To: <1358338096-32081-1-git-send-email-heikki.krogerus@linux.intel.com>

The tty buffer functions are converted to using tty_port
structure instead of struct tty, so we must do the same.

Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
---
 drivers/tty/serial/8250/8250_dma.c |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/tty/serial/8250/8250_dma.c b/drivers/tty/serial/8250/8250_dma.c
index 95516a1..02333fc 100644
--- a/drivers/tty/serial/8250/8250_dma.c
+++ b/drivers/tty/serial/8250/8250_dma.c
@@ -43,8 +43,9 @@ static void __dma_rx_complete(void *param)
 {
 	struct uart_8250_port	*p = param;
 	struct uart_8250_dma	*dma = p->dma;
-	struct tty_struct	*tty = p->port.state->port.tty;
+	struct tty_port		*tty_port = &p->port.state->port;
 	struct dma_tx_state	state;
+	int			count;
 
 	dma_sync_single_for_cpu(dma->rxchan->device->dev, dma->rx_addr,
 				dma->rx_size, DMA_FROM_DEVICE);
@@ -52,10 +53,12 @@ static void __dma_rx_complete(void *param)
 	dmaengine_tx_status(dma->rxchan, dma->rx_cookie, &state);
 	dmaengine_terminate_all(dma->rxchan);
 
-	tty_insert_flip_string(tty, dma->rx_buf, dma->rx_size - state.residue);
-	p->port.icount.rx += dma->rx_size - state.residue;
+	count = dma->rx_size - state.residue;
 
-	tty_flip_buffer_push(tty);
+	tty_insert_flip_string(tty_port, dma->rx_buf, count);
+	p->port.icount.rx += count;
+
+	tty_flip_buffer_push(tty_port);
 }
 
 int serial8250_tx_dma(struct uart_8250_port *p)
-- 
1.7.10.4


  reply	other threads:[~2013-01-16 12:07 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-01-16 12:08 [PATCH 0/4] 8250_dw and 8250_dma fixes Heikki Krogerus
2013-01-16 12:08 ` Heikki Krogerus [this message]
2013-01-16 12:08 ` [PATCH 2/4] serial: 8250_dma: TX optimisation Heikki Krogerus
2013-01-16 12:08 ` [PATCH 3/4] serial: 8250_dw: Use ifdef with ACPI Heikki Krogerus
2013-01-16 12:08 ` [PATCH 4/4] serial: 8250_dw: Set maxburst size Heikki Krogerus

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1358338096-32081-2-git-send-email-heikki.krogerus@linux.intel.com \
    --to=heikki.krogerus@linux.intel.com \
    --cc=alan@linux.intel.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-serial@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).