From patchwork Fri Mar 25 13:56:04 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 662301 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 p2PDu9Do027016 for ; Fri, 25 Mar 2011 13:56:10 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753143Ab1CYN4J (ORCPT ); Fri, 25 Mar 2011 09:56:09 -0400 Received: from www.linutronix.de ([62.245.132.108]:50682 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753270Ab1CYN4I (ORCPT ); Fri, 25 Mar 2011 09:56:08 -0400 Received: from localhost ([127.0.0.1] helo=localhost6.localdomain6) by Galois.linutronix.de with esmtp (Exim 4.72) (envelope-from ) id 1Q37Uj-0004MU-AW; Fri, 25 Mar 2011 14:56:05 +0100 Message-Id: <20110325135542.970002118@linutronix.de> User-Agent: quilt/0.48-1 Date: Fri, 25 Mar 2011 13:56:04 -0000 From: Thomas Gleixner To: Paul Mundt Cc: linux-sh@vger.kernel.org Subject: [patch 1/2] sh: Retrieve the wakeup flag from irq_data References: <20110325135443.709972035@linutronix.de> Content-Disposition: inline; filename=sh-use-wrappers.patch X-Linutronix-Spam-Score: -1.0 X-Linutronix-Spam-Level: - X-Linutronix-Spam-Status: No , -1.0 points, 5.0 required, ALL_TRUSTED=-1 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 25 Mar 2011 13:56:10 +0000 (UTC) Index: linux-2.6-tip/drivers/sh/intc/core.c =================================================================== --- linux-2.6-tip.orig/drivers/sh/intc/core.c +++ linux-2.6-tip/drivers/sh/intc/core.c @@ -427,13 +427,12 @@ static int intc_suspend(struct sys_devic case PM_EVENT_SUSPEND: /* enable wakeup irqs belonging to this intc controller */ for_each_active_irq(irq) { - desc = irq_to_desc(irq); data = irq_get_irq_data(irq); chip = irq_data_get_irq_chip(data); if (chip != &d->chip) continue; - if ((desc->status & IRQ_WAKEUP)) + if (irqd_is_wakeup_set(data)) chip->irq_enable(data); } break;