From 956247593f0eb7f30814bc6c4a0bfc2677da1539 Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Thu, 28 Oct 2010 11:36:31 +0900 Subject: [PATCH] --- yaml --- r: 219601 b: refs/heads/master c: 63111a3a70fb4d80e3b54ed75f13795e98f7a467 h: refs/heads/master i: 219599: 67af810face9b922d52224146e67dba2a0aed876 v: v3 --- [refs] | 2 +- trunk/drivers/sh/intc/core.c | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index e8f199dfa54e..df1fc339c488 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fb41a49d96cd0fb6c63362ff1c8de22e9e7399af +refs/heads/master: 63111a3a70fb4d80e3b54ed75f13795e98f7a467 diff --git a/trunk/drivers/sh/intc/core.c b/trunk/drivers/sh/intc/core.c index 338fad2a3fa4..873a99ff8f64 100644 --- a/trunk/drivers/sh/intc/core.c +++ b/trunk/drivers/sh/intc/core.c @@ -403,11 +403,8 @@ static int intc_suspend(struct sys_device *dev, pm_message_t state) if (d->state.event != PM_EVENT_FREEZE) break; - for_each_irq_nr(irq) { + for_each_active_irq(irq) { desc = irq_to_desc(irq); - if (!desc) - continue; - data = irq_get_irq_data(irq); chip = irq_data_get_irq_chip(data); @@ -428,11 +425,8 @@ static int intc_suspend(struct sys_device *dev, pm_message_t state) break; case PM_EVENT_SUSPEND: /* enable wakeup irqs belonging to this intc controller */ - for_each_irq_nr(irq) { + for_each_active_irq(irq) { desc = irq_to_desc(irq); - if (!desc) - continue; - data = irq_get_irq_data(irq); chip = irq_data_get_irq_chip(data);