From: Felipe Balbi <balbi@ti.com>
To: alan@linux.intel.com
Cc: Tony Lindgren <tony@atomide.com>, Kevin Hilman <khilman@ti.com>,
Linux OMAP Mailing List <linux-omap@vger.kernel.org>,
Linux ARM Kernel Mailing List
<linux-arm-kernel@lists.infradead.org>,
linux-serial@vger.kernel.org,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Santosh Shilimkar <santosh.shilimkar@ti.com>,
Shubhrajyoti Datta <shubhrajyoti@ti.com>,
Felipe Balbi <balbi@ti.com>
Subject: [PATCH v2 08/13] serial: omap: move THRE check to transmit_chars()
Date: Tue, 21 Aug 2012 15:16:06 +0300 [thread overview]
Message-ID: <1345551371-18862-9-git-send-email-balbi@ti.com> (raw)
In-Reply-To: <1345551371-18862-1-git-send-email-balbi@ti.com>
since all other IRQ types now do all necessary
checks inside their handlers, transmit_chars()
was the only one left expecting serial_omap_irq()
to check THRE for it. We can move THRE check to
transmit_chars() in order to make serial_omap_irq()
more uniform.
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
---
drivers/tty/serial/omap-serial.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
index fe9852b..bb63dc9 100644
--- a/drivers/tty/serial/omap-serial.c
+++ b/drivers/tty/serial/omap-serial.c
@@ -195,11 +195,14 @@ static void serial_omap_stop_rx(struct uart_port *port)
pm_runtime_put_autosuspend(up->dev);
}
-static void transmit_chars(struct uart_omap_port *up)
+static void transmit_chars(struct uart_omap_port *up, unsigned int lsr)
{
struct circ_buf *xmit = &up->port.state->xmit;
int count;
+ if (!(lsr & UART_LSR_THRE))
+ return;
+
if (up->port.x_char) {
serial_out(up, UART_TX, up->port.x_char);
up->port.icount.tx++;
@@ -370,8 +373,7 @@ static inline irqreturn_t serial_omap_irq(int irq, void *dev_id)
check_modem_status(up);
break;
case UART_IIR_THRI:
- if (lsr & UART_LSR_THRE)
- transmit_chars(up);
+ transmit_chars(up, lsr);
break;
case UART_IIR_RX_TIMEOUT:
/* FALLTHROUGH */
--
1.7.12.rc3
next prev parent reply other threads:[~2012-08-21 12:22 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-21 9:15 [RFC/PATCH 00/13] OMAP UART patches Felipe Balbi
2012-08-21 9:15 ` [RFC/PATCH 01/13] serial: omap: define and use to_uart_omap_port() Felipe Balbi
2012-08-21 9:15 ` [RFC/PATCH 02/13] serial: omap: always return IRQ_HANDLED Felipe Balbi
2012-08-21 11:50 ` Alan Cox
2012-08-21 11:54 ` Felipe Balbi
2012-08-21 9:15 ` [RFC/PATCH 03/13] serial: omap: define helpers for pdata function pointers Felipe Balbi
2012-08-21 9:15 ` [RFC/PATCH 04/13] serial: omap: don't access the platform_device Felipe Balbi
2012-08-21 9:15 ` [RFC/PATCH 05/13] serial: omap: drop DMA support Felipe Balbi
2012-08-21 9:44 ` Shilimkar, Santosh
2012-08-21 10:20 ` Felipe Balbi
2012-08-21 10:35 ` Shilimkar, Santosh
2012-08-21 10:34 ` Felipe Balbi
2012-08-21 9:15 ` [RFC/PATCH 06/13] serial: add OMAP-specific defines Felipe Balbi
2012-08-21 9:15 ` [RFC/PATCH 07/13] serial: omap: simplify IRQ handling Felipe Balbi
2012-08-21 9:15 ` [RFC/PATCH 08/13] serial: omap: refactor receive_chars() into rdi/rlsi handlers Felipe Balbi
2012-08-21 9:15 ` [RFC/PATCH 09/13] serial: omap: move THRE check to transmit_chars() Felipe Balbi
2012-08-21 9:15 ` [RFC/PATCH 10/13] serial: omap: stick to put_autosuspend Felipe Balbi
2012-08-21 10:42 ` Shilimkar, Santosh
2012-08-21 10:57 ` Felipe Balbi
2012-08-21 11:05 ` Shilimkar, Santosh
2012-08-21 11:02 ` Felipe Balbi
2012-08-21 11:09 ` Felipe Balbi
2012-08-21 9:15 ` [RFC/PATCH 11/13] serial: omap: set dev->drvdata before enabling pm_runtime Felipe Balbi
2012-08-21 9:15 ` [RFC/PATCH 12/13] serial: omap: drop unnecessary check from remove Felipe Balbi
2012-08-21 9:15 ` [RFC/PATCH 13/13] serial: omap: make sure to suspend device before remove Felipe Balbi
2012-08-21 10:43 ` [RFC/PATCH 00/13] OMAP UART patches Shilimkar, Santosh
2012-08-21 12:15 ` [PATCH v2 00/13] OMAP Serial patches Felipe Balbi
2012-08-21 12:15 ` [PATCH v2 01/13] serial: omap: define and use to_uart_omap_port() Felipe Balbi
2012-08-21 12:16 ` [PATCH v2 02/13] serial: omap: define helpers for pdata function pointers Felipe Balbi
2012-08-21 12:16 ` [PATCH v2 03/13] serial: omap: don't access the platform_device Felipe Balbi
2012-08-21 12:16 ` [PATCH v2 04/13] serial: omap: drop DMA support Felipe Balbi
2012-08-21 12:16 ` [PATCH v2 05/13] serial: add OMAP-specific defines Felipe Balbi
2012-08-21 12:16 ` [PATCH v2 06/13] serial: omap: simplify IRQ handling Felipe Balbi
2012-08-21 12:16 ` [PATCH v2 07/13] serial: omap: refactor receive_chars() into rdi/rlsi handlers Felipe Balbi
2012-08-21 12:16 ` Felipe Balbi [this message]
2012-08-21 12:16 ` [PATCH v2 09/13] serial: omap: stick to put_autosuspend Felipe Balbi
2012-08-21 12:16 ` [PATCH v2 10/13] serial: omap: set dev->drvdata before enabling pm_runtime Felipe Balbi
2012-08-21 12:16 ` [PATCH v2 11/13] serial: omap: drop unnecessary check from remove Felipe Balbi
2012-08-21 12:16 ` [PATCH v2 12/13] serial: omap: make sure to suspend device before remove Felipe Balbi
2012-08-21 12:16 ` [PATCH v2 13/13] serial: omap: don't save IRQ flags on hardirq Felipe Balbi
2012-08-21 13:01 ` [PATCH v2 00/13] OMAP Serial patches Felipe Balbi
2012-08-21 15:07 ` Felipe Balbi
2012-08-23 6:26 ` Felipe Balbi
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=1345551371-18862-9-git-send-email-balbi@ti.com \
--to=balbi@ti.com \
--cc=alan@linux.intel.com \
--cc=khilman@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=santosh.shilimkar@ti.com \
--cc=shubhrajyoti@ti.com \
--cc=tony@atomide.com \
/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).