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: 1354571 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 C184D40B17 for ; Tue, 21 Aug 2012 12:21:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757388Ab2HUMU6 (ORCPT ); Tue, 21 Aug 2012 08:20:58 -0400 Received: from na3sys009aog103.obsmtp.com ([74.125.149.71]:50871 "EHLO na3sys009aog103.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757357Ab2HUMUs (ORCPT ); Tue, 21 Aug 2012 08:20:48 -0400 Received: from mail-lpp01m010-f53.google.com ([209.85.215.53]) (using TLSv1) by na3sys009aob103.postini.com ([74.125.148.12]) with SMTP ID DSNKUDN9H4Sjq7ZVZto/KKi8sqNwxl1mWmi6@postini.com; Tue, 21 Aug 2012 05:20:48 PDT Received: by lahc1 with SMTP id c1so3810875lah.40 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=jyNtcqKu6ERZev6AdSrdVlsBq7ncXoDmQmkVxBBwWpTTVdN+icTnDpLbYjfPcg+i8c Ad27P/YHBwT9Ev+Y/vrXa9u7mvdsyNllEWTQ49sZHx6evDAc3JibXwEto5qM3k96n2uT K23GWtRRla8DNavPid1V6/EFHG2IsLncd4ZoIB8UnwJ+x9cuGwyUfC5amjBL1l7oZLuh xyqsmGpdwwzcNz5phlgvS+Bj26aUnYhwyPiOLQpopWU4aCe343lTpryXhK6813xajE7B LGJgkaljiyI7EAWBUlt2Aq1Fo6NdIdgKdEDU7PwvIiLth3QG3meGwgLXImoZxEWRAsrX 4vEw== 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 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: [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: ALoCoQmWXjL41ExaCuVtOPtX+Pv+WOBPOoJGxNmkhn8wwFTorEpAelZrXVp+eEs3FjegdztoDzcn 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. 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);