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: 1353181 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 6169B40210 for ; Tue, 21 Aug 2012 09:22:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755414Ab2HUJWG (ORCPT ); Tue, 21 Aug 2012 05:22:06 -0400 Received: from na3sys009aog133.obsmtp.com ([74.125.149.82]:33359 "EHLO na3sys009aog133.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755437Ab2HUJUZ (ORCPT ); Tue, 21 Aug 2012 05:20:25 -0400 Received: from mail-lb0-f173.google.com ([209.85.217.173]) (using TLSv1) by na3sys009aob133.postini.com ([74.125.148.12]) with SMTP ID DSNKUDNS2H/hhaVGq2ydqckVgN3QvBqfV82S@postini.com; Tue, 21 Aug 2012 02:20:25 PDT Received: by lbbgm13 with SMTP id gm13so4528177lbb.18 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=hiuRtZU7UoqTBm2yFMZxTmccNfgCdu+1ZvxF7jBEWoGlrQde+lL6EYN6bS1NUs5m6r ljM1+dwAUoNFXZRi2uzaHLtUyIrQBvjm/TQQVUBIEu2zwYWrycK0cSXUIeEkdXRQ6efP Sr6or4B81vBmEKSoMd4dqEnlTkUtLz4fNTPldfCupRr+3UwKKKJgdMGbam3j11QfDUTk +Khkd6fHExsYRa0PrVYHofu0Qz3FF5yuuEXNJlnm20UBOJoZnpm64+07iVT9MVWz4bVy sXTG4NYKV3we3B++JguDRQwzUn1erD4lbIryqSPoeF9lmrk74HpNGs0LAH1q9NijI2Y1 XYig== 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 Cc: 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 , Felipe Balbi 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: ALoCoQnd7vY7n4V0KiP1cfIjxwnUBWSXKwBilndhQoOA5KQ6TLfD7D/YwpVqJPfgo9c2b9tYXb9m 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. 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 */