diff options
author | Paul Mundt <lethal@linux-sh.org> | 2012-01-24 00:54:10 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2012-01-24 00:54:10 -0500 |
commit | 5bbda4e4aca4591c85ee53dea157ca5fc9a23306 (patch) | |
tree | 91bd5ac37e62acadccb4d8a79d8e87ab55f0e04a /drivers/sh/intc | |
parent | 5fbebcbdb3730666c0d1d22021a90d8483fc8e02 (diff) |
sh: intc: Prefer IRQCHIP_SKIP_SET_WAKE over a dummy set_wake callback.
It's possible to use IRQCHIP_SKIP_SET_WAKE to get the behaviour that
we're after, without having to bother with a dummy ->set_wake() callback
for the IRQ chip.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/sh/intc')
-rw-r--r-- | drivers/sh/intc/chip.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/sh/intc/chip.c b/drivers/sh/intc/chip.c index 7b246efa94ea..3679645427c1 100644 --- a/drivers/sh/intc/chip.c +++ b/drivers/sh/intc/chip.c | |||
@@ -58,11 +58,6 @@ static void intc_disable(struct irq_data *data) | |||
58 | } | 58 | } |
59 | } | 59 | } |
60 | 60 | ||
61 | static int intc_set_wake(struct irq_data *data, unsigned int on) | ||
62 | { | ||
63 | return 0; /* allow wakeup, but setup hardware in intc_suspend() */ | ||
64 | } | ||
65 | |||
66 | #ifdef CONFIG_SMP | 61 | #ifdef CONFIG_SMP |
67 | /* | 62 | /* |
68 | * This is held with the irq desc lock held, so we don't require any | 63 | * This is held with the irq desc lock held, so we don't require any |
@@ -225,8 +220,8 @@ struct irq_chip intc_irq_chip = { | |||
225 | .irq_disable = intc_disable, | 220 | .irq_disable = intc_disable, |
226 | .irq_shutdown = intc_disable, | 221 | .irq_shutdown = intc_disable, |
227 | .irq_set_type = intc_set_type, | 222 | .irq_set_type = intc_set_type, |
228 | .irq_set_wake = intc_set_wake, | ||
229 | #ifdef CONFIG_SMP | 223 | #ifdef CONFIG_SMP |
230 | .irq_set_affinity = intc_set_affinity, | 224 | .irq_set_affinity = intc_set_affinity, |
231 | #endif | 225 | #endif |
226 | .flags = IRQCHIP_SKIP_SET_WAKE, | ||
232 | }; | 227 | }; |