From patchwork Mon Dec 14 10:30:52 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 67250 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 nBEAYaVl031440 for ; Mon, 14 Dec 2009 10:34:37 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756435AbZLNKd5 (ORCPT ); Mon, 14 Dec 2009 05:33:57 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754291AbZLNKcd (ORCPT ); Mon, 14 Dec 2009 05:32:33 -0500 Received: from smtp.nokia.com ([192.100.122.230]:31215 "EHLO mgw-mx03.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754764AbZLNKc2 (ORCPT ); Mon, 14 Dec 2009 05:32:28 -0500 Received: from vaebh106.NOE.Nokia.com (vaebh106.europe.nokia.com [10.160.244.32]) by mgw-mx03.nokia.com (Switch-3.3.3/Switch-3.3.3) with ESMTP id nBEAVOdZ011174; Mon, 14 Dec 2009 12:31:42 +0200 Received: from esebh102.NOE.Nokia.com ([172.21.138.183]) by vaebh106.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.3959); Mon, 14 Dec 2009 12:31:32 +0200 Received: from mgw-da01.ext.nokia.com ([147.243.128.24]) by esebh102.NOE.Nokia.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.3959); Mon, 14 Dec 2009 12:31:32 +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 nBEAVF21008329; Mon, 14 Dec 2009 12:31:27 +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 2/4] input: misc: twl4030: move to request_threaded_irq Date: Mon, 14 Dec 2009 12:30:52 +0200 Message-Id: <1260786654-13294-3-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:32.0642 (UTC) FILETIME=[9AC4D020: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/misc/twl4030-pwrbutton.c b/drivers/input/misc/twl4030-pwrbutton.c index f5fc997..cd47d9e 100644 --- a/drivers/input/misc/twl4030-pwrbutton.c +++ b/drivers/input/misc/twl4030-pwrbutton.c @@ -39,16 +39,6 @@ static irqreturn_t powerbutton_irq(int irq, void *_pwr) int err; u8 value; -#ifdef CONFIG_LOCKDEP - /* WORKAROUND for lockdep forcing IRQF_DISABLED on us, which - * we don't want and can't tolerate since this is a threaded - * IRQ and can sleep due to the i2c reads it has to issue. - * Although it might be friendlier not to borrow this thread - * context... - */ - local_irq_enable(); -#endif - err = twl4030_i2c_read_u8(TWL4030_MODULE_PM_MASTER, &value, STS_HW_CONDITIONS); if (!err) { @@ -80,7 +70,7 @@ static int __devinit twl4030_pwrbutton_probe(struct platform_device *pdev) pwr->phys = "twl4030_pwrbutton/input0"; pwr->dev.parent = &pdev->dev; - err = request_irq(irq, powerbutton_irq, + err = request_threaded_irq(irq, NULL, powerbutton_irq, IRQF_TRIGGER_FALLING | IRQF_TRIGGER_RISING, "twl4030_pwrbutton", pwr); if (err < 0) {