From patchwork Thu Aug 23 10:32:53 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 1365851 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 F00013FC66 for ; Thu, 23 Aug 2012 10:42:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751465Ab2HWKmR (ORCPT ); Thu, 23 Aug 2012 06:42:17 -0400 Received: from na3sys009aog127.obsmtp.com ([74.125.149.107]:56771 "EHLO na3sys009aog127.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933839Ab2HWKhl (ORCPT ); Thu, 23 Aug 2012 06:37:41 -0400 Received: from mail-lpp01m010-f53.google.com ([209.85.215.53]) (using TLSv1) by na3sys009aob127.postini.com ([74.125.148.12]) with SMTP ID DSNKUDYH9LB0XHm7MGIiLDrsShigTgDqGWKx@postini.com; Thu, 23 Aug 2012 03:37:41 PDT Received: by lahc1 with SMTP id c1so350506lah.12 for ; Thu, 23 Aug 2012 03:37:39 -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=Kqu33uLViNEkLwxyAE8ocVi4LXh5K3grxqs3D3su+Wk=; b=pmcFk+qvwF1QfjCjzVnDNfxqc6LF1DmUYJ7DYAgIywIgpGV/oESpcPh4zqX5793Uns LUIwRSieTJP6upQ6TuJRW8dW37pMcXtLhWKrjyETQZkmxL7eSSe1lhrSA9d2g8yltc9v 3UcWGS2a8aSMemrnW5Ro+TH7R6GFWh72+brfo6xJge6w2mZz71hQzwXgdbzTohWWWrzd ij4dHH18mZHaWfaUl6/zRRUMoQ2VlZZCJlMoKAY8X5QYA5DYCeUaohsQIRlQgrKRvBoF CsDBOA47NLXYR1NlIHwiV4qnEDt/OWrKwMPy4Z38hB9Z+oyHSdrfijlMVcGDuXUbS1UO MfrA== Received: by 10.112.98.70 with SMTP id eg6mr690783lbb.62.1345718259223; Thu, 23 Aug 2012 03:37:39 -0700 (PDT) Received: from localhost (cs78217178.pp.htv.fi. [62.78.217.178]) by mx.google.com with ESMTPS id mt19sm7064200lab.17.2012.08.23.03.37.37 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 23 Aug 2012 03:37:38 -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 , Sourav Poddar , Felipe Balbi Subject: [PATCH v3 13/23] serial: omap: don't save IRQ flags on hardirq Date: Thu, 23 Aug 2012 13:32:53 +0300 Message-Id: <1345717983-18179-14-git-send-email-balbi@ti.com> X-Mailer: git-send-email 1.7.12.rc3 In-Reply-To: <1345717983-18179-1-git-send-email-balbi@ti.com> References: <1345717983-18179-1-git-send-email-balbi@ti.com> X-Gm-Message-State: ALoCoQk+Tt0uTPCVzWEUMenJ57zgwmgEtPeMfea3w4OsYad6CJJla+OOTqYzPlts3FEoVpdzbrBS Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.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 2df725b..8a60212 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_NONE; int max_count = 256; - spin_lock_irqsave(&up->port.lock, flags); + spin_lock(&up->port.lock); pm_runtime_get_sync(up->dev); do { @@ -393,7 +392,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);