mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Heikki Krogerus <heikki.krogerus@linux.intel.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org
Subject: [PATCH 1/9] serial: 8250_dma: TX cleanup
Date: Wed, 10 Apr 2013 16:58:24 +0300	[thread overview]
Message-ID: <1365602312-25436-2-git-send-email-heikki.krogerus@linux.intel.com> (raw)
In-Reply-To: <1365602312-25436-1-git-send-email-heikki.krogerus@linux.intel.com>

Removing one unneeded uart_write_wakeup(). There is no need
to start PIO transfer unless DMA fails, so this also changes
serial8250_tx_dma() to return 0 unless that is the case.

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

diff --git a/drivers/tty/serial/8250/8250_dma.c b/drivers/tty/serial/8250/8250_dma.c
index b9f7fd2..ce2518d 100644
--- a/drivers/tty/serial/8250/8250_dma.c
+++ b/drivers/tty/serial/8250/8250_dma.c
@@ -33,10 +33,8 @@ static void __dma_tx_complete(void *param)
 	if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS)
 		uart_write_wakeup(&p->port);
 
-	if (!uart_circ_empty(xmit) && !uart_tx_stopped(&p->port)) {
+	if (!uart_circ_empty(xmit) && !uart_tx_stopped(&p->port))
 		serial8250_tx_dma(p);
-		uart_write_wakeup(&p->port);
-	}
 }
 
 static void __dma_rx_complete(void *param)
@@ -67,12 +65,11 @@ int serial8250_tx_dma(struct uart_8250_port *p)
 	struct circ_buf			*xmit = &p->port.state->xmit;
 	struct dma_async_tx_descriptor	*desc;
 
-	if (dma->tx_running)
-		return -EBUSY;
+	if (uart_tx_stopped(&p->port) || dma->tx_running ||
+	    uart_circ_empty(xmit))
+		return 0;
 
 	dma->tx_size = CIRC_CNT_TO_END(xmit->head, xmit->tail, UART_XMIT_SIZE);
-	if (!dma->tx_size)
-		return -EINVAL;
 
 	desc = dmaengine_prep_slave_single(dma->txchan,
 					   dma->tx_addr + xmit->tail,
-- 
1.7.10.4


  reply	other threads:[~2013-04-10 14:01 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-10 13:58 [PATCH 0/9] serial: 8250_dma to use the new dmaengine helpers Heikki Krogerus
2013-04-10 13:58 ` Heikki Krogerus [this message]
2013-04-10 13:58 ` [PATCH 2/9] serial: 8250_dma: Fix RX handling Heikki Krogerus
2013-04-10 13:58 ` [PATCH 3/9] serial: 8250_dma: Use dmaengine helpers to get the slave channels Heikki Krogerus
2013-04-10 13:58 ` [PATCH 4/9] serial: 8250_dma: Provide default slave configuration parameters Heikki Krogerus
2013-04-10 13:58 ` [PATCH 5/9] serial: 8250_dw: Enable runtime PM Heikki Krogerus
2013-04-10 13:58 ` [PATCH 6/9] serial: 8250_dw: Support clk framework also with ACPI Heikki Krogerus
2013-04-10 13:58 ` [PATCH 7/9] serial: 8250_dw: Let ACPI code extract the DMA client info Heikki Krogerus
2013-04-10 13:58 ` [PATCH 8/9] serial: 8250_dw: Set port capabilities based on CPR register Heikki Krogerus
2013-04-10 13:58 ` [PATCH 9/9] serial: 8250_dw: Use devm_request_and_ioremap() Heikki Krogerus
2013-04-11 12:20   ` Heikki Krogerus
2013-04-11 12:43     ` [PATCH 9/9] serial: 8250_dw: Convert to devm_ioremap() 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=1365602312-25436-2-git-send-email-heikki.krogerus@linux.intel.com \
    --to=heikki.krogerus@linux.intel.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.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

all inboxes | Powered by JetHome®