From patchwork Fri Oct 1 11:56:03 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh KUMAR X-Patchwork-Id: 223892 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o91C4g6h014143 for ; Fri, 1 Oct 2010 12:04:54 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756734Ab0JAL6P (ORCPT ); Fri, 1 Oct 2010 07:58:15 -0400 Received: from eu1sys200aog107.obsmtp.com ([207.126.144.123]:53759 "EHLO eu1sys200aog107.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756724Ab0JAL6O (ORCPT ); Fri, 1 Oct 2010 07:58:14 -0400 Received: from source ([164.129.1.35]) (using TLSv1) by eu1sys200aob107.postini.com ([207.126.147.11]) with SMTP ID DSNKTKXMwdb1BoXZozh2MIdZ0uhMXOzYpAdc@postini.com; Fri, 01 Oct 2010 11:58:14 UTC Received: from zeta.dmz-eu.st.com (ns2.st.com [164.129.230.9]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 7C39CC9; Fri, 1 Oct 2010 11:57:49 +0000 (GMT) Received: from mail2.dlh.st.com (mail2.dlh.st.com [10.199.8.22]) by zeta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 801D82657; Fri, 1 Oct 2010 11:57:46 +0000 (GMT) Received: from localhost (dlhl0509.dlh.st.com [10.199.7.86]) by mail2.dlh.st.com (MOS 3.8.7a) with ESMTP id CUF00989 (AUTH viresh.kumar@st.com); Fri, 1 Oct 2010 17:27:45 +0530 (IST) From: Viresh KUMAR To: linux-arm-kernel@lists.infradead.org, rtc-linux@googlegroups.com, a.zummo@towertech.it, dbrownell@users.sourceforge.net, linux-usb@vger.kernel.org, linux-input@vger.kernel.org, dmitry.torokhov@gmail.com, linux-mtd@lists.infradead.org, dwmw2@infradead.org Cc: Deepak Sikri , shiraz.hashim@st.com, vipin.kumar@st.com, armando.visconti@st.com, vipulkumar.samar@st.com, rajeev-dlh.kumar@st.com, pratyush.anand@st.com, bhupesh.sharma@st.com, Viresh Kumar Subject: [PATCH V2 43/69] GIC: Added dummy handlers for Power Management Suspend Resume Date: Fri, 1 Oct 2010 17:26:03 +0530 Message-Id: X-Mailer: git-send-email 1.7.2.2 In-Reply-To: References: In-Reply-To: References: Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Fri, 01 Oct 2010 12:04:54 +0000 (UTC) diff --git a/arch/arm/common/gic.c b/arch/arm/common/gic.c index 7dfa9a8..e816ef1 100644 --- a/arch/arm/common/gic.c +++ b/arch/arm/common/gic.c @@ -201,6 +201,18 @@ static void gic_handle_cascade_irq(unsigned int irq, struct irq_desc *desc) chip->unmask(irq); } +#ifdef CONFIG_PM + +static int gic_set_wake(unsigned int irq, unsigned int on) +{ + return 0; +} + +#else + +#define gic_set_wake NULL +#endif + static struct irq_chip gic_chip = { .name = "GIC", .ack = gic_ack_irq, @@ -210,6 +222,7 @@ static struct irq_chip gic_chip = { #ifdef CONFIG_SMP .set_affinity = gic_set_cpu, #endif + .set_wake = gic_set_wake, }; void __init gic_cascade_irq(unsigned int gic_nr, unsigned int irq)