diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-01-24 06:54:10 +0100 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-01-24 06:54:10 +0100 |
| commit | 5bbda4e4aca4591c85ee53dea157ca5fc9a23306 (patch) | |
| tree | 91bd5ac37e62acadccb4d8a79d8e87ab55f0e04a | |
| parent | sh: intc: Make global intc controller counter static. (diff) | |
| download | linux-5bbda4e4aca4591c85ee53dea157ca5fc9a23306.tar.xz linux-5bbda4e4aca4591c85ee53dea157ca5fc9a23306.zip | |
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>
| -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) } } -static int intc_set_wake(struct irq_data *data, unsigned int on) -{ - return 0; /* allow wakeup, but setup hardware in intc_suspend() */ -} - #ifdef CONFIG_SMP /* * 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 = { .irq_disable = intc_disable, .irq_shutdown = intc_disable, .irq_set_type = intc_set_type, - .irq_set_wake = intc_set_wake, #ifdef CONFIG_SMP .irq_set_affinity = intc_set_affinity, #endif + .flags = IRQCHIP_SKIP_SET_WAKE, }; |