From patchwork Thu Sep 6 12:45:25 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 1414671 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id A70B9DFFCF for ; Thu, 6 Sep 2012 12:58:14 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1T9baq-0004uk-Sv; Thu, 06 Sep 2012 12:54:02 +0000 Received: from na3sys009aog129.obsmtp.com ([74.125.149.142]) by merlin.infradead.org with smtps (Exim 4.76 #1 (Red Hat Linux)) id 1T9bXR-0002b9-L3 for linux-arm-kernel@lists.infradead.org; Thu, 06 Sep 2012 12:50:31 +0000 Received: from mail-lb0-f177.google.com ([209.85.217.177]) (using TLSv1) by na3sys009aob129.postini.com ([74.125.148.12]) with SMTP ID DSNKUEicEqWFzTIen/AKAV06Zj7QGVQ/Gl5E@postini.com; Thu, 06 Sep 2012 05:50:29 PDT Received: by lbbgf7 with SMTP id gf7so1091651lbb.36 for ; Thu, 06 Sep 2012 05:50:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=bTdWH0siwJyBeICz0ZElCVUAtVPCGXMLFJwG6fkyfZc=; b=EN6/zHD4Il/mw2BKFa8gMCv2dfeNy5HesRcBhauQhFH54xAIUBpgXcLLI3d9Xv6asD 6/OstPoQ+29NUoihH8YyMja2MTQzb9QBEIfbYjIw3yTgxQhBMMJQdaLdZPI5/m5/qdey iHq1/KwRiD7Cz8TZ7Ymm38/eb7HF40KTUJQn03WwNAjcQBqkJzx/5MV8u0bkY86wcc0z spgdeNSctfQ0dhxH+1xQCDpwRbg1iHmM4JALPIQndFShTmlmQ7AcaYtKBeK8amq4eMAL MMS/YM5+wvj9RLbU6I47kTL8NpAM4Avve7MnsDVj8cPNl9+si090yi7FEWT8H7mj9Fep EWDw== Received: by 10.152.131.37 with SMTP id oj5mr1829156lab.14.1346935825394; Thu, 06 Sep 2012 05:50:25 -0700 (PDT) Received: from localhost (cs78217178.pp.htv.fi. [62.78.217.178]) by mx.google.com with ESMTPS id fz8sm563958lbb.9.2012.09.06.05.50.23 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 06 Sep 2012 05:50:24 -0700 (PDT) From: Felipe Balbi To: Greg KH Subject: [PATCH v4 06/21] serial: omap: move THRE check to transmit_chars() Date: Thu, 6 Sep 2012 15:45:25 +0300 Message-Id: <1346935540-1792-7-git-send-email-balbi@ti.com> X-Mailer: git-send-email 1.7.12.rc3 In-Reply-To: <1346935540-1792-1-git-send-email-balbi@ti.com> References: <20120906122948.GC29202@arwen.pp.htv.fi> <1346935540-1792-1-git-send-email-balbi@ti.com> X-Gm-Message-State: ALoCoQmPh4jTJ1kiNrN7M+GRdmn3Wafymp2NQ1ne2M73YAAyos9ibMsRo+yoBq6+w41T6cq3JiwJ X-Spam-Note: CRM114 invocation failed X-Spam-Score: -4.2 (----) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-4.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [74.125.149.142 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Kevin Hilman , Tony Lindgren , Linux Kernel Mailing List , Felipe Balbi , Santosh Shilimkar , linux-serial@vger.kernel.org, Sourav Poddar , Linux OMAP Mailing List , Shubhrajyoti Datta , Linux ARM Kernel Mailing List , alan@linux.intel.com X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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. Tested-by: Shubhrajyoti D Acked-by: Santosh Shilimkar Signed-off-by: Felipe Balbi --- 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 9c0a4ae..d3fbb70 100644 --- a/drivers/tty/serial/omap-serial.c +++ b/drivers/tty/serial/omap-serial.c @@ -196,11 +196,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 */