From patchwork Thu Aug 23 10:32:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 1366011 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 29533DF2AB for ; Thu, 23 Aug 2012 10:44:46 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1T4Upp-00028y-LV; Thu, 23 Aug 2012 10:40:22 +0000 Received: from na3sys009aog134.obsmtp.com ([74.125.149.83]) by merlin.infradead.org with smtps (Exim 4.76 #1 (Red Hat Linux)) id 1T4Un4-0000r3-MT for linux-arm-kernel@lists.infradead.org; Thu, 23 Aug 2012 10:37:33 +0000 Received: from mail-lpp01m010-f52.google.com ([209.85.215.52]) (using TLSv1) by na3sys009aob134.postini.com ([74.125.148.12]) with SMTP ID DSNKUDYH53KFS6+joV3IOdeRO0iaamQydDr+@postini.com; Thu, 23 Aug 2012 03:37:30 PDT Received: by lage4 with SMTP id e4so451085lag.39 for ; Thu, 23 Aug 2012 03:37:26 -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=y6b/JHxY3048q5fVBAYE1meszY+TmZ3Uv/xy2Wl2tMk=; b=OmANnvOPi/fbpqutzESft2TS6V+aga9OAG7Fv5/z60Yu26y1nGxVVm90TUOGjIsD6I DKDE+GyApKfUikOiRmiF1weTcwxAJMoggK7n1P1wQ+e1eLMkmSI8b0Dj2QkyivbkYNjp c88v4o5CcgWLViktbjLh3O84r+F3IFohcBfKWgrIeKnPxTQkZvTTneXRf5Yz9QjgVc3S 3/8a/hFBMrtQ2mdCNV9GYRY0ErHr5Dlg9Aw3oQJg2/pCDv8FhQYi+ugBxRvjgVlU5t5+ BwkXeDYa4naJtc2QXSzYZ6S4tegzwE6g30/YmPPeYg2CD/mKYnvSx7nT0h+uyf01yCYo H1tg== Received: by 10.112.102.68 with SMTP id fm4mr707055lbb.19.1345718246410; Thu, 23 Aug 2012 03:37:26 -0700 (PDT) Received: from localhost (cs78217178.pp.htv.fi. [62.78.217.178]) by mx.google.com with ESMTPS id sn2sm7066094lab.16.2012.08.23.03.37.24 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 23 Aug 2012 03:37:25 -0700 (PDT) From: Felipe Balbi To: alan@linux.intel.com Subject: [PATCH v3 08/23] serial: omap: move THRE check to transmit_chars() Date: Thu, 23 Aug 2012 13:32:48 +0300 Message-Id: <1345717983-18179-9-git-send-email-balbi@ti.com> X-Mailer: git-send-email 1.7.12.rc3 In-Reply-To: <1345717983-18179-1-git-send-email-balbi@ti.com> References: <1345717983-18179-1-git-send-email-balbi@ti.com> X-Gm-Message-State: ALoCoQmNUZy4yyq6s4nwie406xxjUqqBYXuqZZyLdoZWZtxaYaQMh5uFqHJf4DtNapMFP2BkUmcW 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.83 listed in list.dnswl.org] 0.0 KHOP_BIG_TO_CC Sent to 10+ recipients instaed of Bcc or a list -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 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 e55f9f1..50ba51e 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++; @@ -369,8 +372,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 */