From patchwork Wed Jul 28 10:54:26 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 60134 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from bilbo.ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id E1716100908 for ; Wed, 28 Jul 2010 21:04:11 +1000 (EST) Received: by ozlabs.org (Postfix) id 217B6B70A4; Wed, 28 Jul 2010 21:04:05 +1000 (EST) Delivered-To: linuxppc-dev@ozlabs.org X-Greylist: delayed 593 seconds by postgrey-1.32 at bilbo; Wed, 28 Jul 2010 21:04:04 EST Received: from SMTP02.CITRIX.COM (smtp02.citrix.com [66.165.176.63]) by ozlabs.org (Postfix) with ESMTP id 9E97AB6F10 for ; Wed, 28 Jul 2010 21:04:04 +1000 (EST) X-IronPort-AV: E=Sophos;i="4.55,273,1278302400"; d="scan'208";a="107382894" Received: from ftlpexchmx02.citrite.net ([10.9.154.127]) by FTLPIPO02.CITRIX.COM with ESMTP; 28 Jul 2010 06:54:37 -0400 Received: from smtp01.ad.xensource.com ([10.219.128.104]) by FTLPEXCHMX02.citrite.net with Microsoft SMTPSVC(6.0.3790.4675); Wed, 28 Jul 2010 06:54:37 -0400 Received: from localhost.localdomain (cosworth.uk.xensource.com [10.80.16.52]) by smtp01.ad.xensource.com (8.13.1/8.13.1) with ESMTP id o6SAsSLd017367; Wed, 28 Jul 2010 03:54:35 -0700 From: Ian Campbell To: linux-kernel@vger.kernel.org Subject: [PATCH 3/4] powerpc: Use IRQF_NO_SUSPEND not IRQF_TIMER for non-timer interrupts Date: Wed, 28 Jul 2010 11:54:26 +0100 Message-Id: <1280314467-5637-3-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.5.6.5 In-Reply-To: <1280314445.24292.90.camel@zakaz.uk.xensource.com> References: <1280314445.24292.90.camel@zakaz.uk.xensource.com> X-OriginalArrivalTime: 28 Jul 2010 10:54:37.0224 (UTC) FILETIME=[4566C280:01CB2E43] Cc: Ian Campbell , devicetree-discuss@lists.ozlabs.org, linuxppc-dev@ozlabs.org, Paul Mackerras , Thomas Gleixner X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org kw_i2c_irq and via_pmu_interrupt are not timer interrupts and therefore should not use IRQF_TIMER. Use the recently introduced IRQF_NO_SUSPEND instead since that is the actual desired behaviour. Signed-off-by: Ian Campbell Cc: Thomas Gleixner Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Cc: Grant Likely Cc: linuxppc-dev@ozlabs.org Cc: devicetree-discuss@lists.ozlabs.org --- arch/powerpc/platforms/powermac/low_i2c.c | 4 ++-- drivers/macintosh/via-pmu.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/powerpc/platforms/powermac/low_i2c.c b/arch/powerpc/platforms/powermac/low_i2c.c index 06a137c..1554d29 100644 --- a/arch/powerpc/platforms/powermac/low_i2c.c +++ b/arch/powerpc/platforms/powermac/low_i2c.c @@ -542,11 +542,11 @@ static struct pmac_i2c_host_kw *__init kw_i2c_host_init(struct device_node *np) /* Make sure IRQ is disabled */ kw_write_reg(reg_ier, 0); - /* Request chip interrupt. We set IRQF_TIMER because we don't + /* Request chip interrupt. We set IRQF_NO_SUSPEND because we don't * want that interrupt disabled between the 2 passes of driver * suspend or we'll have issues running the pfuncs */ - if (request_irq(host->irq, kw_i2c_irq, IRQF_TIMER, "keywest i2c", host)) + if (request_irq(host->irq, kw_i2c_irq, IRQF_NO_SUSPEND, "keywest i2c", host)) host->irq = NO_IRQ; printk(KERN_INFO "KeyWest i2c @0x%08x irq %d %s\n", diff --git a/drivers/macintosh/via-pmu.c b/drivers/macintosh/via-pmu.c index 3d4fc0f..5c6b5be 100644 --- a/drivers/macintosh/via-pmu.c +++ b/drivers/macintosh/via-pmu.c @@ -400,11 +400,11 @@ static int __init via_pmu_start(void) printk(KERN_ERR "via-pmu: can't map interrupt\n"); return -ENODEV; } - /* We set IRQF_TIMER because we don't want the interrupt to be disabled + /* We set IRQF_NO_SUSPEND because we don't want the interrupt to be disabled * between the 2 passes of driver suspend, we control our own disabling * for that one */ - if (request_irq(irq, via_pmu_interrupt, IRQF_TIMER, "VIA-PMU", (void *)0)) { + if (request_irq(irq, via_pmu_interrupt, IRQF_NO_SUSPEND, "VIA-PMU", (void *)0)) { printk(KERN_ERR "via-pmu: can't request irq %d\n", irq); return -ENODEV; }