sh: intc: Prefer IRQCHIP_SKIP_SET_WAKE over a dummy set_wake callback.
authorPaul Mundt <lethal@linux-sh.org>
Tue, 24 Jan 2012 05:54:10 +0000 (14:54 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Tue, 24 Jan 2012 05:54:10 +0000 (14:54 +0900)
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>
drivers/sh/intc/chip.c

index 7b246ef..3679645 100644 (file)
@@ -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,
 };