From patchwork Mon Dec 14 10:30:51 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 67251 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nBEAYaVm031440 for ; Mon, 14 Dec 2009 10:34:37 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756440AbZLNKeX (ORCPT ); Mon, 14 Dec 2009 05:34:23 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755105AbZLNKcb (ORCPT ); Mon, 14 Dec 2009 05:32:31 -0500 Received: from smtp.nokia.com ([192.100.122.233]:30194 "EHLO mgw-mx06.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754621AbZLNKcY (ORCPT ); Mon, 14 Dec 2009 05:32:24 -0500 Received: from esebh106.NOE.Nokia.com (esebh106.ntc.nokia.com [172.21.138.213]) by mgw-mx06.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id nBEAVZ78028844; Mon, 14 Dec 2009 12:31:43 +0200 Received: from vaebh104.NOE.Nokia.com ([10.160.244.30]) by esebh106.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.3959); Mon, 14 Dec 2009 12:31:29 +0200 Received: from mgw-da01.ext.nokia.com ([147.243.128.24]) by vaebh104.NOE.Nokia.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.3959); Mon, 14 Dec 2009 12:31:28 +0200 Received: from localhost.localdomain (esdhcp04340.research.nokia.com [172.21.43.40]) by mgw-da01.ext.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id nBEAVF20008329; Mon, 14 Dec 2009 12:31:23 +0200 From: Felipe Balbi To: linux-kernel@vger.kernel.org Cc: Linux OMAP Mailing List , Tony Lindgren , Aaro Koskinen , David Brownell , Linux USB Mailing List , Anton Vorontsov , Grazvydas Ignotas , Madhusudhan Chikkature , Greg Kroah-Hartman , Mark Brown , Samuel Ortiz , Felipe Balbi Subject: [RFC/PATCH 1/4] input: keyboard: twl4030: move to request_threaded_irq Date: Mon, 14 Dec 2009 12:30:51 +0200 Message-Id: <1260786654-13294-2-git-send-email-felipe.balbi@nokia.com> X-Mailer: git-send-email 1.6.6.rc0 In-Reply-To: <20091212183410.GF3092@sirena.org.uk> References: <20091212183410.GF3092@sirena.org.uk> X-OriginalArrivalTime: 14 Dec 2009 10:31:29.0044 (UTC) FILETIME=[989FCD40:01CA7CA8] X-Nokia-AV: Clean Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org diff --git a/drivers/input/keyboard/twl4030_keypad.c b/drivers/input/keyboard/twl4030_keypad.c index 9a2977c..753a693 100644 --- a/drivers/input/keyboard/twl4030_keypad.c +++ b/drivers/input/keyboard/twl4030_keypad.c @@ -253,14 +253,6 @@ static irqreturn_t do_kp_irq(int irq, void *_kp) u8 reg; int ret; -#ifdef CONFIG_LOCKDEP - /* WORKAROUND for lockdep forcing IRQF_DISABLED on us, which - * we don't want and can't tolerate. Although it might be - * friendlier not to borrow this thread context... - */ - local_irq_enable(); -#endif - /* Read & Clear TWL4030 pending interrupt */ ret = twl4030_kpread(kp, ®, KEYP_ISR1, 1); @@ -403,7 +395,8 @@ static int __devinit twl4030_kp_probe(struct platform_device *pdev) * * NOTE: we assume this host is wired to TWL4040 INT1, not INT2 ... */ - error = request_irq(kp->irq, do_kp_irq, 0, pdev->name, kp); + error = request_threaded_irq(kp->irq, NULL, do_kp_irq, + 0, pdev->name, kp); if (error) { dev_info(kp->dbg_dev, "request_irq failed for irq no=%d\n", kp->irq);