From patchwork Thu Sep 6 12:45:30 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 1414741 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 F12A4DFFCF for ; Thu, 6 Sep 2012 13:00:59 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1T9bd7-0006nv-Tm; Thu, 06 Sep 2012 12:56:24 +0000 Received: from na3sys009aog132.obsmtp.com ([74.125.149.250]) by merlin.infradead.org with smtps (Exim 4.76 #1 (Red Hat Linux)) id 1T9bXf-0002kO-9e for linux-arm-kernel@lists.infradead.org; Thu, 06 Sep 2012 12:50:44 +0000 Received: from mail-lpp01m010-f49.google.com ([209.85.215.49]) (using TLSv1) by na3sys009aob132.postini.com ([74.125.148.12]) with SMTP ID DSNKUEicIVcxG/VrjeCSsv/2b2s7mXZA1oM6@postini.com; Thu, 06 Sep 2012 05:50:43 PDT Received: by lagu2 with SMTP id u2so1046410lag.36 for ; Thu, 06 Sep 2012 05:50:40 -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=fo3ZyUh25gVlygonilebj6aS9fJB8hbWJ3JTi4L8eKY=; b=h7H3ZXXzvvIWhcHWfE4pfI3uVwcfnqTrekaO3ONTByXkxOEmKObO3iAs1RoGAlRa5N 1Th1m3QDxG7MVZQHFB0DXq2qQH5fktsh5zU+5QVBnxZBpe2JHFCGIrcPs84sAKNRPeWN xETaJuNHkRLTyf8KyfRyAVkIvrryjRiJAaBZ9JhRuVajceBM97hdyJ6Fl9L8nktob784 1xJANlIjA94O0sr0tENE7cRkdydHKI7jbK5ZdUsYv83L8knzKpk3amyixHrebrMWPgHp LTKvOWj7HjATLMy9j6j03Wp2jeGALIoxcB+BoA41URN9f6UJoWcs3l/r+t7PXs3oKyws c88Q== Received: by 10.152.104.77 with SMTP id gc13mr1845142lab.31.1346935839832; Thu, 06 Sep 2012 05:50:39 -0700 (PDT) Received: from localhost (cs78217178.pp.htv.fi. [62.78.217.178]) by mx.google.com with ESMTPS id hg4sm2058196lab.11.2012.09.06.05.50.37 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 06 Sep 2012 05:50:38 -0700 (PDT) From: Felipe Balbi To: Greg KH Subject: [PATCH v4 11/21] serial: omap: don't save IRQ flags on hardirq Date: Thu, 6 Sep 2012 15:45:30 +0300 Message-Id: <1346935540-1792-12-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: ALoCoQmEQRsLGn5K9R0N54Y5ukx3O2hIHS5my0lWktN1wpdDPAlwdFyxJaVrhYJQpJHaH/SnNlm8 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.250 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, Sourav Poddar , Linux OMAP Mailing List , Shubhrajyoti Datta , Linux ARM Kernel Mailing List , alan@linux.intel.com 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. Tested-by: Shubhrajyoti D 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 0ceca44..99042b0 100644 --- a/drivers/tty/serial/omap-serial.c +++ b/drivers/tty/serial/omap-serial.c @@ -351,11 +351,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_NONE; 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);