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: 1414541 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 16812DFFCF for ; Thu, 6 Sep 2012 12:55:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754644Ab2IFMzI (ORCPT ); Thu, 6 Sep 2012 08:55:08 -0400 Received: from na3sys009aog131.obsmtp.com ([74.125.149.247]:59189 "EHLO na3sys009aog131.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755148Ab2IFMu2 (ORCPT ); Thu, 6 Sep 2012 08:50:28 -0400 Received: from mail-lpp01m010-f46.google.com ([209.85.215.46]) (using TLSv1) by na3sys009aob131.postini.com ([74.125.148.12]) with SMTP ID DSNKUEicE3/ygI48qIoNct40QlVWni8NewhM@postini.com; Thu, 06 Sep 2012 05:50:27 PDT Received: by lagy9 with SMTP id y9so1063120lag.19 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=E0t3OHZLAgVlshLLbo3iPfDCeydxnJwaCEK7tLgwHMfkZfSNp9/wm8MnkUk0kuCf0L 3hFuPfCWePeDHXyk6UrKTreDQ8OZCqWQpWTe0q3unoiqox1/wXjhYtU7qlBArV1N5GGI 5IyyxswlyC+hvr/eSZEXtahjgnqf99gCFUkQLVLtuhaQRS86w4BSlraEJiLU6vUxH6/z NnvYIoPL2GzVzVumfrOjv6y41bEuYMH5+06tnSuA0eW5+y/0vtExX4txXkyrHl3nqsWY SWqdn90EIiSNGh48MpcoxnnOheD62pO90WEP2getFQc/RJvikEAXva3S+yYt9sIxGvta m/qQ== 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 Cc: alan@linux.intel.com, Tony Lindgren , Kevin Hilman , Linux OMAP Mailing List , Linux ARM Kernel Mailing List , linux-serial@vger.kernel.org, Linux Kernel Mailing List , Santosh Shilimkar , Shubhrajyoti Datta , Sourav Poddar , Felipe Balbi 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: ALoCoQlc1e7vUdcrmj+q+zkVT/+6ZXuA/lUBACMXz1834P5OpGsQHvFogYLPYjVMWiJMPJWz4fpA Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.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 */