From patchwork Tue Aug 21 12:16:11 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 1354891 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 1FB0640B05 for ; Tue, 21 Aug 2012 12:29:54 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1T3nWO-0007P3-DK; Tue, 21 Aug 2012 12:25:26 +0000 Received: from na3sys009aog118.obsmtp.com ([74.125.149.244]) by merlin.infradead.org with smtps (Exim 4.76 #1 (Red Hat Linux)) id 1T3nSC-0004TL-Gc for linux-arm-kernel@lists.infradead.org; Tue, 21 Aug 2012 12:21:05 +0000 Received: from mail-lpp01m010-f49.google.com ([209.85.215.49]) (using TLSv1) by na3sys009aob118.postini.com ([74.125.148.12]) with SMTP ID DSNKUDN9H4Sjq7ZVZto/KKi8sqNwxl1mWmi6@postini.com; Tue, 21 Aug 2012 05:21:04 PDT Received: by lagu2 with SMTP id u2so4553926lag.8 for ; Tue, 21 Aug 2012 05:20:45 -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=aJyOqo5apuAxQQzRfoDsA6qZfa2zXUehfT7AC+UuQrU=; b=d34Jk6kbxBSqKrUhf/DqaLPFKNl84xGkg1jfsHT8cWB+hC1TtAX2dATWpMmNHKApDt 9OxDFkq0nYYOfQe8+siFCpLvZvSvm8sUiycR89VBCtx5Y3pZDOfawAY0YhyhjewVvfcW QII5fGRba4NsJ0T6gUAo/PkGrXkONQGwkrDeaiqi65ZwGX2vXjpj9uQ89nWuM18qxWKE y0xsWQ6ACJZdUnm01pIcZbvhO+JxNl4qHOhfkxOjxTTBpoB6Zz52t6C9tjnX0cPTfLG6 0FuI45PKGVwjhNTbVFyXEq4Sql1lEmUdDpw/iUSuY4Qbg5BeDt78jrt68/nDMh55Pa6R 3lZg== Received: by 10.152.123.206 with SMTP id mc14mr4320226lab.33.1345551645915; Tue, 21 Aug 2012 05:20:45 -0700 (PDT) Received: from localhost (cs78217178.pp.htv.fi. [62.78.217.178]) by mx.google.com with ESMTPS id u10sm393606lbf.11.2012.08.21.05.20.44 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 21 Aug 2012 05:20:45 -0700 (PDT) From: Felipe Balbi To: alan@linux.intel.com Subject: [PATCH v2 13/13] serial: omap: don't save IRQ flags on hardirq Date: Tue, 21 Aug 2012 15:16:11 +0300 Message-Id: <1345551371-18862-14-git-send-email-balbi@ti.com> X-Mailer: git-send-email 1.7.12.rc3 In-Reply-To: <1345551371-18862-1-git-send-email-balbi@ti.com> References: <1345540555-24359-1-git-send-email-balbi@ti.com> <1345551371-18862-1-git-send-email-balbi@ti.com> X-Gm-Message-State: ALoCoQmIxyAD9E0rdru0J4wNrD+CeGRC2IYR2BxHPD8eDDEjg8l7Z+OB7feWw1K5n4JAN04Ne25R 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.244 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 When we're running our hardirq handler, there's not need to disable IRQs with spin_lock_irqsave() because IRQs are already disabled. It also makes no difference if we save or not IRQ flags. Switch over to simple spin_lock/spin_unlock and drop the "flags" variable. Signed-off-by: Felipe Balbi --- drivers/tty/serial/omap-serial.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c index b79c4fa..a79658d 100644 --- a/drivers/tty/serial/omap-serial.c +++ b/drivers/tty/serial/omap-serial.c @@ -350,11 +350,10 @@ static inline irqreturn_t serial_omap_irq(int irq, void *dev_id) struct tty_struct *tty = up->port.state->port.tty; unsigned int iir, lsr; unsigned int type; - unsigned long flags; irqreturn_t ret = IRQ_HANDLED; int max_count = 256; - spin_lock_irqsave(&up->port.lock, flags); + spin_lock(&up->port.lock); pm_runtime_get_sync(up->dev); do { @@ -394,7 +393,7 @@ static inline irqreturn_t serial_omap_irq(int irq, void *dev_id) } } while (!(iir & UART_IIR_NO_INT) && max_count--); - spin_unlock_irqrestore(&up->port.lock, flags); + spin_unlock(&up->port.lock); tty_flip_buffer_push(tty);