Skip to content

Commit

Permalink
sh: intc: Prefer IRQCHIP_SKIP_SET_WAKE over a dummy set_wake callback.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Paul Mundt committed Jan 24, 2012
1 parent 5fbebcb commit 5bbda4e
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions drivers/sh/intc/chip.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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,
};

0 comments on commit 5bbda4e

Please sign in to comment.