From patchwork Tue Aug 21 09:15:51 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 1353381 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 0951D40210 for ; Tue, 21 Aug 2012 09:27:48 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1T3kfp-0003IX-MX; Tue, 21 Aug 2012 09:22:58 +0000 Received: from na3sys009aog129.obsmtp.com ([74.125.149.142]) by merlin.infradead.org with smtps (Exim 4.76 #1 (Red Hat Linux)) id 1T3kdN-000249-RR for linux-arm-kernel@lists.infradead.org; Tue, 21 Aug 2012 09:20:27 +0000 Received: from mail-lpp01m010-f44.google.com ([209.85.215.44]) (using TLSv1) by na3sys009aob129.postini.com ([74.125.148.12]) with SMTP ID DSNKUDNS2H/hhaVGq2ydqckVgN3QvBqfV82S@postini.com; Tue, 21 Aug 2012 02:20:25 PDT Received: by lahm15 with SMTP id m15so4664395lah.17 for ; Tue, 21 Aug 2012 02:20:22 -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=wK3BTCXFJeW2aY0/PWT62Omh/vv5Ktq3jhDmPBU3P04=; b=NBzv9nLtLsV9fHtOqpcIJQQnYayJferol/JltcWmpXxUsmVlr3Ay79qITEBJd6RdBW X3zvBO3eSpoVgLjTyv7aVIENQj/g5+vqteN8JP0Ew+z8Rh8t95CGEg3bY4+GsRh72wlu CAAGIl++LihC4Y4RD08gy/qxCGShltrGyNIJAKn5FnJfI+WCDmwEpK1jNw/Js/rtaImM LYiYPnWV48XeCKpEp1q1NtnFGEPrievmxqHn88OPRUKq4jmGPjFIb7cO89ELpiyWJhKy wZ+4+VOAQ1LPtbnLBeO4GVGl4WBTHy/iu97/QyFvVhwSDcRbbR5kmKgcavC2RZpGHeCB b4SA== Received: by 10.152.105.51 with SMTP id gj19mr16782742lab.38.1345540822616; Tue, 21 Aug 2012 02:20:22 -0700 (PDT) Received: from localhost (cs78217178.pp.htv.fi. [62.78.217.178]) by mx.google.com with ESMTPS id ba4sm280944lbb.14.2012.08.21.02.20.20 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 21 Aug 2012 02:20:21 -0700 (PDT) From: Felipe Balbi To: alan@linux.intel.com Subject: [RFC/PATCH 09/13] serial: omap: move THRE check to transmit_chars() Date: Tue, 21 Aug 2012 12:15:51 +0300 Message-Id: <1345540555-24359-10-git-send-email-balbi@ti.com> X-Mailer: git-send-email 1.7.12.rc3 In-Reply-To: <1345540555-24359-1-git-send-email-balbi@ti.com> References: <1345540555-24359-1-git-send-email-balbi@ti.com> X-Gm-Message-State: ALoCoQlTZMo3mByVn0kIXHk7s50Ti6I4F7VIpH7fVAL3GCfAs5E8HB54x2odyK6OGf2yFuZpUJGm 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, 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. 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 74a4f0a..6ea24c5 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++; @@ -367,8 +370,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 */